diff --git a/Pathfinder-Neceros/pathfinder-neceros.html b/Pathfinder-Neceros/pathfinder-neceros.html
index 6fd05018c2..c3047b1b1f 100644
--- a/Pathfinder-Neceros/pathfinder-neceros.html
+++ b/Pathfinder-Neceros/pathfinder-neceros.html
@@ -1299,7 +1299,6 @@
 						
 						<div class="sheet-repeating_ids sheet-table-row">
 							<input type="hidden" title="@{repeating_class-ability_$X_new_flag}" name="attr_new_flag" value="0"  />
-							<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;" ><input title="@{repeating_class-ability_$X_row_index}" type="number" name="attr_row_index" value="0" class="sheet-calc" readonly="readonly" /><br>Index</span>
 							<span class="sheet-table-data sheet-center sheet-small-label" style="width:17%;" ><input title="@{repeating_class-ability_$X_row_id}" type="text" name="attr_row_id" value="" class="sheet-calc" readonly="readonly" /><br>ID</span>
 							<span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
 						</div>
@@ -2450,7 +2449,6 @@
 						
 						<div class="sheet-repeating_ids sheet-table-row">
 							<input type="hidden" title="@{repeating_weapon_$X_new_flag}" name="attr_new_flag" value="0"  />
-							<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;" ><input title="@{repeating_weapon_$X_row_index}" type="number" name="attr_row_index" value="0" class="sheet-calc" readonly="readonly" /><br>Index</span>
 							<span class="sheet-table-data sheet-center sheet-small-label" style="width:17%;" ><input title="@{repeating_weapon_$X_row_id}" type="text" name="attr_row_id" value="" class="sheet-calc" readonly="readonly" /><br>ID</span>
 							<span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
 						</div>
@@ -6284,7 +6282,6 @@
 						<textarea class="sheet-macro-text" title="@{repeating_feat_$X_macro-text}" name="attr_macro-text">@{PC-whisper} &{template:pf_block} {{header_image=@{header_image-pf_block}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}}  {{name=@{name}}} {{description=@{short-description}}}</textarea>
 						<div class="sheet-repeating_ids sheet-table-row">
 							<input type="hidden" title="@{repeating_feat_$X_new_flag}" name="attr_new_flag" value="0"  />
-							<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;" ><input title="@{repeating_feat_$X_row_index}" type="number" name="attr_row_index" value="0" class="sheet-calc" readonly="readonly" /><br>Index</span>
 							<span class="sheet-table-data sheet-center sheet-small-label" style="width:17%;" ><input title="@{repeating_feat_$X_row_id}" type="text" name="attr_row_id" value="" class="sheet-calc" readonly="readonly" /><br>ID</span>
 							<span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
 						</div>
@@ -6432,7 +6429,6 @@
 						<textarea class="sheet-macro-text" title="@{repeating_item_$X_macro-text}" name="attr_macro-text">@{PC-whisper} &{template:pf_block} {{header_image=@{header_image-pf_block}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=@{name}}} {{description=@{short-description}}}</textarea>
 						<div class="sheet-repeating_ids sheet-table-row">
 							<input type="hidden" title="@{repeating_item_$X_new_flag}" name="attr_new_flag" value="0"  />
-							<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;" ><input title="@{repeating_item_$X_row_index}" type="number" name="attr_row_index" value="0" class="sheet-calc" readonly="readonly" /><br>Index</span>
 							<span class="sheet-table-data sheet-center sheet-small-label" style="width:17%;" ><input title="@{repeating_item_$X_row_id}" type="text" name="attr_row_id" value="" class="sheet-calc" readonly="readonly" /><br>ID</span>
 							<span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
 						</div>
@@ -8265,7 +8261,6 @@
 						<textarea class="sheet-macro-text" title="@{repeating_racial-trait_$X_macro-text}" name="attr_macro-text">@{PC-whisper} &{template:pf_block} {{header_image=@{header_image-pf_block}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=@{name}}} {{description=@{short-description}}}</textarea>
 						<div class="sheet-repeating_ids sheet-table-row">
 							<input type="hidden" title="@{repeating_racial-trait_$X_new_flag}" name="attr_new_flag" value="0"  />
-							<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;" ><input title="@{repeating_racial-trait_$X_row_index}" type="number" name="attr_row_index" value="0" class="sheet-calc" readonly="readonly" /><br>Index</span>
 							<span class="sheet-table-data sheet-center sheet-small-label" style="width:17%;" ><input title="@{repeating_racial-trait_$X_row_id}" type="text" name="attr_row_id" value="" class="sheet-calc" readonly="readonly" /><br>ID</span>
 							<span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
 						</div>
@@ -8313,7 +8308,6 @@
 						<textarea class="sheet-macro-text" title="@{repeating_trait_$X_macro-text}" name="attr_macro-text">@{PC-whisper} &{template:pf_block} {{header_image=@{header_image-pf_block}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=@{name}}} {{description=@{short-description}}}</textarea>						
 						<div class="sheet-repeating_ids sheet-table-row">
 							<input type="hidden" title="@{repeating_trait_$X_new_flag}" name="attr_new_flag" value="0"  />
-							<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;" ><input title="@{repeating_trait_$X_row_index}" type="number" name="attr_row_index" value="0" class="sheet-calc" readonly="readonly" /><br>Index</span>
 							<span class="sheet-table-data sheet-center sheet-small-label" style="width:17%;" ><input title="@{repeating_trait_$X_row_id}" type="text" name="attr_row_id" value="" class="sheet-calc" readonly="readonly" /><br>ID</span>
 							<span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
 						</div>
@@ -8881,7 +8875,6 @@
 								<textarea class="sheet-macro-text" title="@{repeating_weapon_$X_macro-text}" name="attr_macro-text">@{NPC-whisper} &{template:pf_attack} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=@{name}}} {{attack=[[ 1d20cs>[[ @{crit-target} ]] + [[ @{total-attack} ]] ]]}} {{damage=[[ @{damage-dice-num}d@{damage-die} + [[ @{total-damage} ]] ]]}} {{crit_confirm=[[ 1d20 + [[ @{total-attack} ]] ]]}} {{crit_damage=[[ [[ (@{damage-dice-num} * (@{crit-multiplier} - 1)) ]]d@{damage-die} + [[ (@{total-damage} * (@{crit-multiplier} - 1)) ]] ]]}} {{type=@{type}}} {{description=@{notes}}} @{iterative_attacks} @{macro_options}</textarea>
 								<div class="sheet-repeating_ids sheet-table-row">
 									<input type="hidden" title="@{repeating_weapon_$X_new_flag}" name="attr_new_flag" value="0"  />
-									<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;" ><input title="@{repeating_weapon_$X_row_index}" type="number" name="attr_row_index" value="0" class="sheet-calc" readonly="readonly" /><br>Index</span>
 									<span class="sheet-table-data sheet-center sheet-small-label" style="width:17%;" ><input title="@{repeating_weapon_$X_row_id}" type="text" name="attr_row_id" value="" class="sheet-calc" readonly="readonly" /><br>ID</span>
 									<span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
 								</div>
@@ -8982,7 +8975,6 @@
 										<input type="checkbox" class="sheet-repeating_ids-show" title="@{repeating_npc-spell-like-abilities_$X_ids-show}" name="attr_ids-show" value="1" style="opacity:0;width: 40px; height:1.5em; position:relative; top:0; left:0;margin: 0px -15px 0 -25px; cursor:pointer; z-index:1;" /><span></span>
 										<div class="sheet-repeating_ids sheet-table-row">
 											<input type="hidden" title="@{repeating_npc-spell-like-abilities_$X_new_flag}" name="attr_new_flag" value="0"  />
-											<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;" ><input title="@{repeating_npc-spell-like-abilities_$X_row_index}" type="number" name="attr_row_index" value="0" class="sheet-calc" readonly="readonly" /><br>Index</span>
 											<span class="sheet-table-data sheet-center sheet-small-label" style="width:17%;" ><input title="@{repeating_npc-spell-like-abilities_$X_row_id}" type="text" name="attr_row_id" value="" class="sheet-calc" readonly="readonly" /><br>ID</span>
 											<span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
 										</div>
@@ -9076,7 +9068,6 @@
 										<input type="checkbox" class="sheet-repeating_ids-show" title="@{repeating_npc-spells1_$X_ids-show}" name="attr_ids-show" value="1" style="opacity:0;width: 40px; height:1.5em; position:relative; top:0; left:0;margin: 0px -15px 0 -25px; cursor:pointer; z-index:1;" /><span></span>
 										<div class="sheet-repeating_ids sheet-table-row">
 											<input type="hidden" title="@{repeating_npc-spells1_$X_new_flag}" name="attr_new_flag" value="0"  />
-											<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;" ><input title="@{repeating_npc-spells1_$X_row_index}" type="number" name="attr_row_index" value="0" class="sheet-calc" readonly="readonly" /><br>Index</span>
 											<span class="sheet-table-data sheet-center sheet-small-label" style="width:17%;" ><input title="@{repeating_npc-spells1_$X_row_id}" type="text" name="attr_row_id" value="" class="sheet-calc" readonly="readonly" /><br>ID</span>
 											<span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
 										</div>
@@ -9170,7 +9161,6 @@
 										<input type="checkbox" class="sheet-repeating_ids-show" title="@{repeating_npc-spells2_$X_ids-show}" name="attr_ids-show" value="1" style="opacity:0;width: 40px; height:1.5em; position:relative; top:0; left:0;margin: 0px -15px 0 -25px; cursor:pointer; z-index:1;" /><span></span>
 										<div class="sheet-repeating_ids sheet-table-row">
 											<input type="hidden" title="@{repeating_npc-spells2_$X_new_flag}" name="attr_new_flag" value="0"  />
-											<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;" ><input title="@{repeating_npc-spells2_$X_row_index}" type="number" name="attr_row_index" value="0" class="sheet-calc" readonly="readonly" /><br>Index</span>
 											<span class="sheet-table-data sheet-center sheet-small-label" style="width:17%;" ><input title="@{repeating_npc-spells2_$X_row_id}" type="text" name="attr_row_id" value="" class="sheet-calc" readonly="readonly" /><br>ID</span>
 											<span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
 										</div>
@@ -9270,7 +9260,6 @@
                                 <textarea class="sheet-macro-text" title="@{repeating_feat_$X_macro-text}" name="attr_macro-text">@{NPC-whisper} &{template:pf_block} {{header_image=@{header_image-pf_block}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=@{name}}} {{description=@{short-description}}}</textarea>								
 								<div class="sheet-repeating_ids sheet-table-row">
 									<input type="hidden" title="@{repeating_feat_$X_new_flag}" name="attr_new_flag" value="0"  />
-									<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;" ><input title="@{repeating_feat_$X_row_index}" type="number" name="attr_row_index" value="0" class="sheet-calc" readonly="readonly" /><br>Index</span>
 									<span class="sheet-table-data sheet-center sheet-small-label" style="width:17%;" ><input title="@{repeating_feat_$X_row_id}" type="text" name="attr_row_id" value="" class="sheet-calc" readonly="readonly" /><br>ID</span>
 									<span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
 								</div>
@@ -9622,7 +9611,6 @@
                         <textarea class="sheet-macro-text" title="@{repeating_racial-trait_$X_macro-text}" name="attr_macro-text">@{NPC-whisper} &{template:pf_block} {{header_image=@{header_image-pf_block}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=@{name}}} {{description=@{short-description}}}</textarea>						
 						<div class="sheet-repeating_ids sheet-table-row">
 							<input type="hidden" title="@{repeating_racial-trait_$X_new_flag}" name="attr_new_flag" value="0"  />
-							<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;" ><input title="@{repeating_racial-trait_$X_row_index}" type="number" name="attr_row_index" value="0" class="sheet-calc" readonly="readonly" /><br>Index</span>
 							<span class="sheet-table-data sheet-center sheet-small-label" style="width:17%;" ><input title="@{repeating_racial-trait_$X_row_id}" type="text" name="attr_row_id" value="" class="sheet-calc" readonly="readonly" /><br>ID</span>
 							<span class="sheet-table-data sheet-center sheet-small-label">&nbsp;</span>
 						</div>
@@ -10294,52 +10282,23 @@
 </div>
 
 <script type="text/worker">
- //var getSectionIDs=function(){};
- //var getAttrs=function(){};
- //var setAttrs=function(){};
- //var on=function(){};
 
 var ExExp = ExExp|| (function(){
 
     parseExpression = function (s, until) {
-        var untilCb = (typeof until == "function" ? until : function (tok) {
+        var untilCb = (typeof until === "function" ? until : function (tok) {
             return (tok == until);
         });
 
         // constants
-        var ARG_COUNTS = {
-            'abs': 1
-            , 'ceil': 1
-            , 'floor': 1
-            , 'round': 1
-            , 'max': [1]
-            , 'min': [1]
-        };
+		var ARG_COUNTS = { 'abs': 1 , 'ceil': 1 , 'floor': 1 , 'round': 1 , 'max': [1] , 'min': [1] };
         var BINARY_PRECEDENCE = {
-            '?': 1
-            , ':': 2
-            , '||': 3
-            , '&&': 4
-            , '|': 5
-            , '^': 6
-            , '&': 7
-            , '=': 8
-            , '==': 8
-            , '!=': 8
-            , '>=': 9
-            , '>': 9
-            , '<': 9
-            , '<=': 9
-            , '<<': 10
-            , '>>': 10
-            , '+': 11
-            , '-': 11
-            , '*': 12
-            , '/': 12
-            , '%': 12
-            , '**': 14
-            , 't': 98
-            , 'd': 99
+            '?': 1, ':': 2, '||': 3, '&&': 4, '|': 5, '^': 6
+			, '&': 7, '=': 8, '==': 8, '!=': 8, '>=': 9, '>': 9
+			, '<': 9, '<=': 9, '<<': 10, '>>': 10, '+': 11, '-': 11
+			, '*': 12, '/': 12, '%': 12
+			, '**': 14
+			, 't': 98, 'd': 99
         };
         var UNARY_PRECEDENCE = {
             '!': 13
@@ -10350,12 +10309,9 @@ var ExExp = ExExp|| (function(){
             '(': ")"
             , '{': "}"
         };
-
+		
         // local variables
-        var operators = [{
-                'precedence': 0
-            }]
-            , operands = [];
+        var operators = [{'precedence': 0}], operands = [];
 
         // helper functions
         function getToken(s) {
@@ -10436,13 +10392,13 @@ var ExExp = ExExp|| (function(){
             var i = -1
                 , j = i;
             // find first index of delim not preceeded by an odd number of backslashes
-            while (((i - j) & 1) == 0) {
+            while (((i - j) & 1) === 0) {
                 i = state.s.indexOf(delim, i + 1);
                 if (i < 0) {
                     return;
                 }
                 j = i - 1;
-                while ((j >= 0) && (state.s.charAt(j) == '\\')) {
+                while ((j >= 0) && (state.s.charAt(j) === '\\')) {
                     j--;
                 }
             }
@@ -10468,7 +10424,7 @@ var ExExp = ExExp|| (function(){
             var right = operands.pop();
             if (op.unary) {
                 operands.push({
-                    'type': (op.type == "baseoperator" ? "unop" : "unopex")
+                    'type': (op.type === "baseoperator" ? "unop" : "unopex")
                     , 'datatype': right.datatype
                     , 'operator': op.text
                     , 'operand': right
@@ -10476,17 +10432,17 @@ var ExExp = ExExp|| (function(){
                 return;
             }
             var left = operands.pop();
-            if (op.text != ":") {
+            if (op.text !== ":") {
                 var datatype;
-                if ((op.text == "d") || (op.text == "t")) {
+                if (op.text === "d" || op.text === "t") {
                     datatype = "number";
-                } else if (left.datatype == right.datatype) {
+                } else if (left.datatype === right.datatype) {
                     datatype = left.datatype;
-                } else if ((left.datatype == "string") || (right.datatype == "string")) {
+                } else if ((left.datatype === "string") || (right.datatype === "string")) {
                     datatype = "string";
                 }
                 operands.push({
-                    'type': (op.type == "baseoperator" ? "binop" : "binopex")
+                    'type': (op.type === "baseoperator" ? "binop" : "binopex")
                     , 'datatype': datatype
                     , 'operator': op.text
                     , 'left': left
@@ -10497,7 +10453,7 @@ var ExExp = ExExp|| (function(){
                 return;
             }
             op = operators.pop();
-            if (op.text != "?") {
+            if (op.text !== "?") {
                 return "Error: Expected ? but got " + op.text;
             }
             var cond = operands.pop();
@@ -10506,7 +10462,7 @@ var ExExp = ExExp|| (function(){
                 , 'cond': cond
                 , 'left': left
                 , 'right': right
-                , 'datatype': (left.datatype == right.datatype ? left.datatype : undefined)
+                , 'datatype': (left.datatype === right.datatype ? left.datatype : undefined)
             });
         }
 
@@ -10523,7 +10479,7 @@ var ExExp = ExExp|| (function(){
         }
 
         function argListUntil(tok) {
-            return (tok == ',') || (tok == ')');
+            return (tok === ',') || (tok === ')');
         }
 
         function parseHelper() {
@@ -10533,7 +10489,7 @@ var ExExp = ExExp|| (function(){
             if (!s.tok) {
                 return "Error: Unrecognized token: " + s.s.split(" ", 1)[0];
             }
-            while (s.tok.type == "whitespace") {
+            while (s.tok.type === "whitespace") {
                 popToken(s);
                 if (!s.tok) {
                     return "Error: Unrecognized token: " + s.s.split(" ", 1)[0];
@@ -10544,19 +10500,20 @@ var ExExp = ExExp|| (function(){
                 var func = s.tok.match[1];
                 var argCounts = ARG_COUNTS[func]
                     , minArgs, maxArgs;
-                if (typeof (argCounts) == typeof (0)) {
-                    minArgs = argCounts;
-                    maxArgs = argCounts;
-                } else if (typeof (argCounts) == typeof ([])) {
+				if (argCounts === undefined) {
+                    return "Error: Unrecognized function: " + func;
+                }
+				if (Array.isArray(argCounts) ) {
                     minArgs = argCounts[0];
                     maxArgs = argCounts[1];
                 } else {
-                    return "Error: Unrecognized function: " + func;
-                }
+                    minArgs = argCounts;
+                    maxArgs = argCounts;
+                } 
                 var args = [];
-                while ((s.tok) && (s.tok.text != ')')) {
+                while ((s.tok) && (s.tok.text !== ')')) {
                     var argTree = parseExpression(s, argListUntil);
-                    if (typeof (argTree) == typeof ("")) {
+                    if (typeof (argTree) === "string") {
                         return argTree;
                     } // error
                     args.push(argTree);
@@ -10567,10 +10524,10 @@ var ExExp = ExExp|| (function(){
                         return "Error: Expected ',' or ')' to continue/close '" + func + "(', but got '" + s.tok.text + "'";
                     }
                 }
-                if ((typeof (minArgs) != typeof (0)) || (minArgs < 0)) {
+                if (minArgs < 0) {
                     minArgs = args.length;
                 }
-                if ((typeof (maxArgs) != typeof (0)) || (maxArgs < 0)) {
+                if (isNaN(maxArgs)||maxArgs<0) {
                     maxArgs = args.length;
                 }
                 if (args.length < minArgs) {
@@ -10601,7 +10558,7 @@ var ExExp = ExExp|| (function(){
                 return;
             case "quote":
                 var str = popString(s, s.tok.text);
-                if (typeof (str) != typeof ("")) {
+                if (typeof (str) !== "string" ) {
                     return "Error: Unterminated string";
                 }
                 operands.push({
@@ -10614,20 +10571,20 @@ var ExExp = ExExp|| (function(){
                 var opener = s.tok.text
                     , closer = CLOSERS[opener];
                 var operand = parseExpression(s, closer);
-                if (typeof (operand) == typeof ("")) {
+                if (typeof (operand) === "string") {
                     return operand;
                 } // error
                 operands.push(operand);
-                if (s.tok.text != closer) {
+                if (s.tok.text !== closer) {
                     return "Error: Expected '" + closer + "' to close '" + opener + "', but got '" + s.tok.text + "'";
                 }
                 return;
             case "openvariable":
                 var varExp = parseExpression(s, "}");
-                if (typeof (varExp) == typeof ("")) {
+                if (typeof (varExp) === "string") {
                     return varExp;
                 } // error
-                if (s.tok.text != "}") {
+                if (s.tok.text !== "}") {
                     return "Error: Expected '}' to close '${', but got '" + s.tok.text + "'";
                 }
                 operands.push({
@@ -10647,11 +10604,11 @@ var ExExp = ExExp|| (function(){
                 }
                 return parseHelper();
             }
-            return "Error: Unrecognized token: " + s.tok.text + (s.tok.type == "raw" ? s.s.split(" ", 1)[0] : "");
+            return "Error: Unrecognized token: " + s.tok.text + (s.tok.type === "raw" ? s.s.split(" ", 1)[0] : "");
         }
 
         // if we were given a string, construct a state object
-        if (typeof (s) == typeof ("")) {
+        if (typeof (s) === "string") {
             s = {
                 's': s
             };
@@ -10663,23 +10620,23 @@ var ExExp = ExExp|| (function(){
             return err;
         }
         for (popToken(s);
-            (s.tok) && (!untilCb(s.tok.text)) && ((until) || (s.tok.type != "raw")); popToken(s)) {
+            (s.tok) && (!untilCb(s.tok.text)) && ((until) || (s.tok.type !== "raw")); popToken(s)) {
             switch (s.tok.type) {
             case "extoperator":
             case "baseoperator":
-                rollOperator = (s.tok.text == "d" ? s.tok : null);
+                rollOperator = (s.tok.text === "d" ? s.tok : null);
                 err = pushOperator(s.tok);
                 if (err) {
                     return err;
                 }
-                if ((rollOperator) && (s.s.charAt(0) == 'F')) {
+                if ((rollOperator) && (s.s.charAt(0) === 'F')) {
                     operands.push({
                         'type': "rollspec"
                         , 'value': "F"
                     })
                     s.s = s.s.substring(1);
-                } else if (s.tok.text == "t") {
-                    if (s.s.charAt(0) != '[') {
+                } else if (s.tok.text === "t") {
+                    if (s.s.charAt(0) !== '[') {
                         return "Error: 't' operator requires '[table]' argument";
                     }
                     var m = s.s.match(/^\[([^'"$(\]][^\]]*)\]/);
@@ -10690,10 +10647,10 @@ var ExExp = ExExp|| (function(){
                     } else {
                         s.s = s.s.substring(1);
                         tableExp = parseExpression(s, "]");
-                        if (typeof (tableExp) == typeof ("")) {
+                        if (typeof (tableExp) === "string") {
                             return tableExp;
                         } // error
-                        if (s.tok.text != "]") {
+                        if (s.tok.text !== "]") {
                             return "Error: Expected ']' to close 't[', but got '" + s.tok.text + "'";
                         }
                     }
@@ -10716,7 +10673,7 @@ var ExExp = ExExp|| (function(){
                 }
                 break;
             case "label":
-                if ((operators.length > 0) && (operators[operators.length - 1].text == "d")) {
+                if ((operators.length > 0) && (operators[operators.length - 1].text === "d")) {
                     // set label on "d" operator instead of operand (e.g. "1d6[foo]" is "(1d6)[foo]", not "1d(6[foo])")
                     operators[operators.length - 1].label = s.tok.match[1];
                     break;
@@ -10746,6 +10703,9 @@ var ExExp = ExExp|| (function(){
 
 
     sendCommand= function (chunks, asts, evalResults, labels) {
+		//infinite loop
+		//TAS.log("at sendCommand");
+		//TAS.log(chunks);TAS.log(asts); TAS.log(evalResults);TAS.log(labels);
         // constants
         var FUNCTION_FUNCTIONS = {
             'abs': Math.abs
@@ -10857,17 +10817,17 @@ var ExExp = ExExp|| (function(){
             case "string":
                 return t;
             case "tablename":
-                if (typeof (t.value) != typeof ("")) {
+                if (typeof (t.value) !== "string") {
                     x = lazyEval(t.value, labels, references, unevalRefs, evalReqs, true);
-                    if (typeof (x) == typeof ("")) {
+                    if (typeof (x) === "string") {
                         return x;
                     } // error
-                    if (x.type == "number") {
+                    if (x.type === "number") {
                         // number node; coerce to string
                         x.value = "" + x.value;
                         x.type = "string"
                     }
-                    if (x.type != "string") {
+                    if (x.type !== "string") {
                         // unable to fully evaluate table name
                         if (t.baseValid) {
                             t.baseValid = false;
@@ -10885,14 +10845,14 @@ var ExExp = ExExp|| (function(){
                 var args = [];
                 for (var i = 0; i < t.args.length; i++) {
                     x = lazyEval(t.args[i], labels, references, unevalRefs, evalReqs, true);
-                    if (typeof (x) == typeof ("")) {
+                    if (typeof (x) === "string") {
                         return x;
                     } // error
-                    if (x.type == "string") {
+                    if (x.type === "string") {
                         x.value = parseFloat(x.value);
                         x.type = "number";
                     }
-                    if (x.type != "number") {
+                    if (x.type !== "number") {
                         // unable to fully evaluate argument
                         if (t.baseValid) {
                             t.baseValid = false;
@@ -10916,13 +10876,13 @@ var ExExp = ExExp|| (function(){
                 return t;
             case "unop":
             case "unopex":
-                force = force || (t.type != "unop");
+                force = force || (t.type !== "unop");
                 x = lazyEval(t.operand, labels, references, unevalRefs, evalReqs, force);
-                if (typeof (x) == typeof ("")) {
+                if (typeof (x) === "string") {
                     return x;
                 } // error
                 if (force) {
-                    if (x.type != "number") {
+                    if (x.type !== "number") {
                         // unable to fully evaluate operand
                         if (t.baseValid) {
                             t.baseValid = false;
@@ -10945,42 +10905,48 @@ var ExExp = ExExp|| (function(){
                 return t;
             case "binop":
             case "binopex":
-                force = force || (t.type != "binop") || (t.left.datatype == "string") || (t.right.datatype == "string");
-                var forceSubtrees = force || (t.operator == "d") || (t.operator == "t");
+                force = force || (t.type !== "binop") || (t.left.datatype === "string") || (t.right.datatype === "string");
+                var forceSubtrees = force || (t.operator === "d") || (t.operator === "t");
                  //alert('left is: ' + t.left + ', right is:' + t.right);
                 x = lazyEval(t.left, labels, references, unevalRefs, evalReqs, forceSubtrees);
                 y = lazyEval(t.right, labels, references, unevalRefs, evalReqs, forceSubtrees);
-                    //alert('typeof left:' + typeof x + ', typeof right:' + typeof y);
+                //    TAS.log("At binop the values are: x:"+x+", y:"+y);
+				//	TAS.log(x);
+				//	TAS.log(y);
                     force = true;
-               // if (typeof (x) == typeof ("")) {
-               //     return x;
-               // } // error
-                //if (typeof (y) == typeof ("")) {
-                //    return y;
-               // } // error
+				/*****************************************************/
+                if (typeof x === "string") {
+				//	TAS.log(x);
+                    return x;
+                } // error
+                if (typeof y === "string") {
+				//	TAS.log(y);
+                    return y;
+                } // error
+				/****************************************************/
                 if (force) {
-                    if ((x.type != "number") && (x.type != "string")) {
+                    if ((x.type !== "number") && (x.type !== "string")) {
                         // unable to fully evaluate left operand
                         if (t.baseValid) {
                             t.baseValid = false;
                         }
                         return t;
                     }
-                    if ((y.type != "number") && (y.type != "string") && (y.type != "rollspec") && (y.type != "tablename")) {
+                    if ((y.type !== "number") && (y.type !== "string") && (y.type !== "rollspec") && (y.type !== "tablename")) {
                         // unable to fully evaluate right operand
                         if (t.baseValid) {
                             t.baseValid = false;
                         }
                         return t;
                     }
-                    if ((y.type == "rollspec") && (t.operator != "d")) {
+                    if ((y.type === "rollspec") && (t.operator !== "d")) {
                         return "Rollspec operand is only compatible with 'd' operator";
                     }
-                    if ((t.operator == "t") && (y.type != "tablename")) {
+                    if ((t.operator === "t") && (y.type !== "tablename")) {
                         return "'t' operator requires tablename operand";
                     }
                     // successfully evaluated both operands
-                    if ((t.operator == "t") || ((t.operator == "d") && (t.mods))) {
+                    if ((t.operator === "t") || ((t.operator === "d") && (t.mods))) {
                         // operator is rollable table or is roll with mods; must submit to base system for evaluation
                         evalReqs.push(t);
                         return t;
@@ -10996,20 +10962,20 @@ var ExExp = ExExp|| (function(){
                         labels[t.right.label] = y;
                     }
                     delete t.right;
-                    t.type = (typeof (t.value) == typeof ("") ? "string" : "number");
+                    t.type = (typeof (t.value) === "string" ? "string" : "number");
                     t.datatype = t.type;
-                    t.baseValid = (t.datatype == "number");
-                } else if ((x.datatype == "number") && (y.datatype == "number")) {
+                    t.baseValid = (t.datatype === "number");
+                } else if ((x.datatype === "number") && (y.datatype === "number")) {
                     t.datatype = "number";
                     t.baseValid = true;
                 }
                 return t;
             case "cond":
                 x = lazyEval(t.cond, labels, references, unevalRefs, evalReqs, true);
-                if (typeof (x) == typeof ("")) {
+                if (typeof (x) === "string") {
                     return x;
                 } // error
-                if ((x.type != "number") && (x.type != "string")) {
+                if ((x.type !== "number") && (x.type !== "string")) {
                     // unable to fully evaluate condition
                     t.baseValid = false;
                     return t;
@@ -11029,17 +10995,17 @@ var ExExp = ExExp|| (function(){
                 }
                 return lazyEval(t, labels, references, unevalRefs, evalReqs, force);
             case "variable":
-                if (typeof (t.value) != typeof ("")) {
+                if (typeof (t.value) !== "string") {
                     x = lazyEval(t.value, labels, references, unevalRefs, evalReqs, true);
-                    if (typeof (x) == typeof ("")) {
+                    if (typeof (x) === "string") {
                         return x;
                     } // error
-                    if (x.type == "number") {
+                    if (x.type === "number") {
                         // number node; coerce to string
                         x.value = "" + x.value;
                         x.type = "string"
                     }
-                    if (x.type != "string") {
+                    if (x.type !== "string") {
                         // unable to fully evaluate variable name
                         if (t.baseValid) {
                             t.baseValid = false;
@@ -11051,7 +11017,7 @@ var ExExp = ExExp|| (function(){
                     t.value = x.value;
                 }
                 // if we got here, t.value is the name of a variable
-                if ((labels[t.value]) && ((labels[t.value].type == "string") || (labels[t.value].type == "number"))) {
+                if ((labels[t.value]) && ((labels[t.value].type === "string") || (labels[t.value].type === "number"))) {
                     // variable exists and has been fully evaluated
                     t.type = labels[t.value].type;
                     t.datatype = labels[t.value].datatype;
@@ -11075,7 +11041,7 @@ var ExExp = ExExp|| (function(){
 
         function hasUnevaluatedLabels(t) {
             // base types: fully evaluated
-            if ((t.type == "number") || (t.type == "string") || (t.type == "rollspec")) {
+            if ((t.type === "number") || (t.type === "string") || (t.type === "rollspec")) {
                 return false;
             }
 
@@ -11095,7 +11061,7 @@ var ExExp = ExExp|| (function(){
                 return false;
             case "tablename":
             case "variable":
-                if (typeof (t.value) == typeof ("")) {
+                if (typeof (t.value) === "string") {
                     return false;
                 }
                 return hasUnevaluatedLabels(t.value);
@@ -11132,7 +11098,7 @@ var ExExp = ExExp|| (function(){
                 break;
             case "binop":
                 retval = "(" + flattenAST(t.left) + t.operator + flattenAST(t.right) + (t.mods || "") + ")";
-                if ((t.label) && (t.operator == "d")) {
+                if ((t.label) && (t.operator === "d")) {
                     retval += "[" + t.label + "]";
                 }
                 break;
@@ -11144,7 +11110,7 @@ var ExExp = ExExp|| (function(){
         }
 
         function astToCmd(t) {
-            if (t.type == "string") {
+            if (t.type === "string") {
                 return t.value;
             }
             var retval = flattenAST(t);
@@ -11174,11 +11140,11 @@ var ExExp = ExExp|| (function(){
             if (asts[i].baseValid) {
                 continue;
             } // can be handled by base expression evaluator
-            if ((asts[i].type == "string") || (asts[i].type == "number")) {
+            if ((asts[i].type === "string") || (asts[i].type === "number")) {
                 continue;
             } // tree is fully evaluated
             var err = lazyEval(asts[i], labels, references, unevalRefs, evalReqs, false);
-            if (typeof (err) == typeof ("")) {
+            if (typeof (err) === "string") {
                 return reportError(err);
             }
         }
@@ -11193,14 +11159,14 @@ var ExExp = ExExp|| (function(){
                 if (!labels[label]) {
                     return reportError("Variable '" + label + "' not defined");
                 }
-                if ((labels[label].type != "string") && (labels[label].type != "number")) {
+                if ((labels[label].type !== "string") && (labels[label].type !== "number")) {
                     // variable exists but not yet evaluated; try to evaluate
                     var err = lazyEval(labels[label], labels, references, unevalRefs, evalReqs, true);
-                    if (typeof (err) == typeof ("")) {
+                    if (typeof (err) === "string") {
                         return reportError(err);
                     }
                 }
-                if ((labels[label].type == "string") || (labels[label].type == "number")) {
+                if ((labels[label].type === "string") || (labels[label].type === "number")) {
                     // variable fully evaluated; substitute it in
                     for (var i = 0; i < references[label].length; i++) {
                         references[label][i].type = labels[label].type;
@@ -11217,10 +11183,10 @@ var ExExp = ExExp|| (function(){
             var newUneval = [];
             while (unevalRefs.length > 0) {
                 var r = lazyEval(unevalRefs.shift(), labels, references, unevalRefs, evalReqs, true);
-                if (typeof (r) == typeof ("")) {
+                if (typeof (r) === "string") {
                     return reportError(err);
                 }
-                if ((r.type == "string") || (r.type == "number")) {
+                if ((r.type === "string") || (r.type === "number")) {
                     doSubstitution = true;
                 } else {
                     newUneval.push(r);
@@ -11232,7 +11198,7 @@ var ExExp = ExExp|| (function(){
 
         // flatten fully evaluated ASTs into strings and splice into chunks
         for (var i = asts.length - 1; i >= 0; i--) {
-            if ((!asts[i].baseValid) && (asts[i].type != "number") && (asts[i].type != "string")) {
+            if ((!asts[i].baseValid) && (asts[i].type !== "number") && (asts[i].type !== "string")) {
                 continue;
             }
             if ((unevalRefs.length > 0) & (hasUnevaluatedLabels(asts[i]))) {
@@ -11263,8 +11229,11 @@ var ExExp = ExExp|| (function(){
         var state = {
             's': cmd
         };
-        var ast = parseExpression(state, null);
-        if (typeof (ast) == typeof ("")) {
+        var ast ;
+		//TAS.log(msg);
+		ast= parseExpression(state, null);
+		//TAS.log(ast);
+        if (typeof (ast) === "string") {
             ExExp.write("could not parse"+msg);
             return "";
         }
@@ -11283,6 +11252,7 @@ var ExExp = ExExp|| (function(){
 }());
 
 
+
 var SWUtils = SWUtils || (function() {
 
     /*no macro calls, dropdowns, or keep  highest/lowest more than 1
@@ -11294,8 +11264,8 @@ var SWUtils = SWUtils || (function() {
             return false;
         }
 
-        var r2=preeval.replace(/floor|ceil|round|abs|max|min|kh1|kl1/g,'');
-        anyIllegal = r2.match(/[a-zA-Z]/);
+        anyIllegal=preeval.replace(/floor|ceil|round|abs|max|min|kh1|kl1/g,'');
+        anyIllegal = anyIllegal.match(/[a-zA-Z]/);
         if (anyIllegal) {
             return false;
         }
@@ -11339,9 +11309,8 @@ var SWUtils = SWUtils || (function() {
                 fieldnames[i]=matches[i].replace("@{","").replace("}","");
             }
             getAttrs(fieldnames,function(values){
-                var evalstr=fromfield;
+                var evalstr=fromfield,replacements=[numfields];
                 try {
-                    var replacements=[numfields];
                     for (i=0;i<numfields;i++){
                         replacements[i]=values[fieldnames[i]];
                     }
@@ -11379,7 +11348,13 @@ var SWUtils = SWUtils || (function() {
             var evaluated;
             console.log("search and replace of " + exprStr +" resulted in " + replacedStr);
             replacedStr=replacedStr.replace(/\s+/g,'').replace(/\[\[/g,"(").replace(/\]\]/g,")");
-            if (typeof replacedStr !== "undefined" && replacedStr !== null && validNumericStr(replacedStr) ) {
+			if(!isNaN(parseFloat(replacedStr)) && isFinite(replacedStr)) {
+				evaluated=parseFloat(replacedStr);
+				console.log("sending back "+evaluated); 
+				callback(evaluated);
+			}
+			if (!isNaN(evaluated)) {  console.log("sending back "+evaluated); callback(evaluated); }
+            else if (typeof replacedStr !== "undefined" && replacedStr !== null && validNumericStr(replacedStr) ) {
                 evaluated = ExExp.handleExpression(replacedStr);
                 console.log("sending back "+evaluated);
                 callback( evaluated);
@@ -11456,7 +11431,9 @@ var SWUtils = SWUtils || (function() {
             } else {
                 //console.log("ok evaluate "+values[readField]);
                 evaluateExpression(values[readField],function(value2){
-                    //console.log("came back with "+value2);
+                    console.log("came back with "+value2+", is it NaN?:"+isNaN(value2));
+					//look for ( and ) at begining and end 
+					
                     value2=isNaN(value2)?trueDefault:value2;
                     if (forceUpdate || currVal!==value2) {
                         setter[writeField]=value2;
@@ -11476,8 +11453,8 @@ var SWUtils = SWUtils || (function() {
 			//console.log("setAttributeNumber setting with "+newVal);
 			//console.log(v);
             var setter={},
-            val = parseInt(v[fieldToUpdate],10)||0;
-            if (newVal !== val ) {
+            val = parseInt(v[fieldToUpdate],10);
+            if (newVal !== val || isNaN(val)) {
                 setter[fieldToUpdate]=newVal;
                 setAttrs(setter);
             }
@@ -11529,6 +11506,7 @@ var SWUtils = SWUtils || (function() {
 			if (typeof fieldToFind === "undefined" || fieldToFind === null) {
 				callback("");
 			} else if (fieldToFind==="0" || fieldToFind===0 || fieldToFind.indexOf("0")===0 ) {
+				//select = none
 				callback(0);
 			} else {
 				foundField = synchrousFindAttributeFunc(fieldToFind);
@@ -11538,7 +11516,52 @@ var SWUtils = SWUtils || (function() {
 				});
 			}
 		});
-	};
+	},
+	
+
+    /* handleDropdown
+     * Looks at a dropdown, evaluates the number the selected item refers to, and then
+     * sets the writeFields with that number.
+     *
+     * @readField {string} = the dropdpown field
+     * @writeFields {string or Array} = Fields to write the value to
+	 * @synchrousFindAttributeFunc {function} takes value of @readField and says what the lookup field is.	 
+     * @callback {function} =  (optional) if we need to update the field, call this function
+     *         with the value we set as the only parameter.
+     */
+    handleDropdown = function (readField,writeFields,synchrousFindAttributeFunc,callback) {
+		SWUtils.getReferencedAttributeValue(readField,synchrousFindAttributeFunc,function(valueOf){
+			if (typeof writeFields === "string") {
+				getAttrs([writeFields],function(v){
+					var currValue=parseInt(v[writeFields],10),setter={};
+					if (currValue!==valueOf || isNaN(writeFields)) {
+						setter[writeFields]=valueOf;
+						setAttrs(setter);
+						if (typeof callback === "function" ) {
+							callback(valueOf);
+						}
+					}
+				});
+			} else if (Array.isArray(writeFields)){
+				getAttrs(writeFields,function(v){
+					var i=0, setany=0,setter = {};
+					for( i=0;i<writeFields.length;i++) {
+						if (v[writeFields[i]] !== valueOf) {
+							setter[writeFields[i]]=valueOf;
+							setany++;
+						}
+					}
+					if (setany) {
+						setAttrs(setter);
+						if (typeof callback === "function" ) {
+							callback(valueOf);
+						}
+					}
+				});
+			}
+        });
+    };
+
 
     return {
          util:{  validNumericStr:validNumericStr
@@ -11557,7 +11580,7 @@ var SWUtils = SWUtils || (function() {
 
 var PFSheet = PFSheet || (function(){
 
-    var version= 0.20,
+    var version= 0.21,
 	pfDebug = false,
 	
     //Utilities
@@ -11614,19 +11637,6 @@ var PFSheet = PFSheet || (function(){
     },
 
 	
-    /* getDropdownVal
-     * by passing the value of a dropdown that has string references to abilties,
-     * this determines what ability / field it references, finds that field in
-     * the sheet, and calls the callback function passing the value in.
-     * If new dropdowns are made, ensure the fields referenced are in the
-     * findAbilityInString method.
-     *
-     * @readField = the dropdown we are looking at
-     * @callback = a function that takes one integer parameter, which is the value the dropdown selection represents
-     */
-    getDropdownVal = function (readField,callback) {
-		SWUtils.getReferencedAttributeValue(readField,findAbilityInString,callback);
-    },
 
     /* handleDropdown
      * Looks at a dropdown, evaluates the number the selected item refers to, and then
@@ -11638,66 +11648,78 @@ var PFSheet = PFSheet || (function(){
      *         with the value we set as the only parameter.
      */
     handleDropdown = function (readField,writeFields,callback) {
-        if ( !writeFields ) {
-            return;
-        }
 		SWUtils.getReferencedAttributeValue(readField,findAbilityInString,function(valueOf){
-			//getDropdownVal(readField,function(valueOf){
-            getAttrs(writeFields,function(v){
-                var i, setany=0,setter = {};
-                for( i=0;i<writeFields.length;i++) {
-                    if (v[writeFields[i]] !== valueOf) {
-                        setter[writeFields[i]]=valueOf;
-                        setany++;
-                    }
-                }
-                if (setany) {
-                    setAttrs(setter);
-                    if (typeof callback === "function" ) {
-                        callback(valueOf);
-                    }
-                }
-            });
+			if (typeof writeFields === "string") {
+				getAttrs([writeFields],function(v){
+					var currValue=parseInt(v[writeFields],10),setter={};
+					if (currValue!==valueOf || isNaN(writeFields)) {
+						setter[writeFields]=valueOf;
+						setAttrs(setter);
+						if (typeof callback === "function" ) {
+							callback(valueOf);
+						}
+					}
+				});
+			} else if (Array.isArray(writeFields)){
+				getAttrs(writeFields,function(v){
+					var i=0, setany=0,setter = {};
+					for( i=0;i<writeFields.length;i++) {
+						if (v[writeFields[i]] !== valueOf) {
+							setter[writeFields[i]]=valueOf;
+							setany++;
+						}
+					}
+					if (setany) {
+						setAttrs(setter);
+						if (typeof callback === "function" ) {
+							callback(valueOf);
+						}
+					}
+				});
+			}
         });
     },
-	
-	/*handleRepeatingDropdown
-	* Use this instead of handleDropdown for those dropdown that exist inside repeating sections
-	* from a context OUTSIDE of the row. (so if looping through and setting them all, etc)
-	* @id {string} = the ID of the row via getSectionIDs
-	* @section {string} = the name of the repeating section that appears after "repeating_"
-	* @readField {string} = the field name to read the short name inside the repeating row , that comes after the $X_
-	* @writeField {string} = the field name to write to - the short name inside the repeating row, that comes after the $X_
+
+	/*handleNonFFDefenseDropdown
+	*@read {string} = attribute of dropdown
+	*@write1 {string} = attribute to write to with value dropdown refers to
+	*@writeIfNegative {string} = the Flat Footed attribute to write to if the value is negative 
 	*/
-    handleRepeatingDropdown= function (id,section,readField,writeField){
-		var fieldPrefix="repeating_"+section +"_" +  id + "_";
-		SWUtils.getReferencedAttributeValue(fieldPrefix+ readField,findAbilityInString,function(valueOf){
-			var updateField=fieldPrefix+writeField,setter={};
-			getAttrs([updateField],function(v){
-				var curr=parseInt(v[updateField],10);
-				if (isNaN(curr) || curr != valueOf) {
-					setter[updateField]=valueOf;
-					setAttrs(valueOf);
-				}
-			});
-        //getDropdownVal(fieldPrefix+ readField,function(valueOf) {
-		//	SWUtils.setAttributeNumber(fieldPrefix+ writeField,valueOf);
-        });
-    },
+	handleNonFFDefenseDropdown=function(read,write1,read2,writeIfNegative){
+		console.log("at handleNonFFDefenseDropdown");
+		handleDropdown(read,write1,function(dexmod){
+			var setter={};
+			console.log("handleNonFFDefenseDropdown: returned dexmod of "+dexmod);
+			if(dexmod<0){
+				setter[writeIfNegative]=dexmod;
+				setAttrs(setter);
+			}else {
+				//if it changes to 0 or  positive then ff should be reset
+				handleDropdown(read2,writeIfNegative);
+			}
+		});
+	},
 	
-    /* handleRepeatingMacro
-    * Evaluates the macro text in the readField, and writes the result to writeField.
-    * helper function for repeating items,
-	* @id {string} = the ID of the row via getSectionIDs
-	* @section {string} = the name of the repeating section that appears after "repeating_"
-	* @readField {string} = the field name to read the short name inside the repeating row , that comes after the $X_
-	* @writeField {string} = the field name to write to - the short name inside the repeating row, that comes after the $X_
-    */
-    handleRepeatingMacro = function(id,section,readField,writeField){
-        var toRead= "repeating_"+section +"_" +id+"_"+readField,
-        toWrite="repeating_"+section +"_" +id+"_"+writeField;
-        SWUtils.evaluateAndSetNumber(toRead,toWrite);
-    },
+	handleDefenseDropdown= function(ability) {
+		console.log("at handleDefenseDropdown:"+ability);
+		switch(ability){
+			case "CMD-ability1":
+				handleDropdown("CMD-ability1",["CMD-STR"]);
+				break;
+			case "AC-ability":
+				handleNonFFDefenseDropdown("AC-ability","AC-ability-mod","FF-ability","FF-DEX");
+				break;
+			case "CMD-ability2":
+				handleNonFFDefenseDropdown("CMD-ability2","CMD-DEX","CMD-ability","FF-CMD-DEX");
+				break;
+			case "FF-ability":
+				handleDropdown("FF-ability",["FF-DEX"]);
+				break;
+			case "CMD-ability":
+				handleDropdown("CMD-ability",["FF-CMD-DEX"]);
+				break;
+		}
+	},
 
     /* updateRowTotal
 	* Adds up numbers and puts it in the first field of the fields array.
@@ -11708,10 +11730,9 @@ var PFSheet = PFSheet || (function(){
     * @penalties {Array} = array of fieldnames to be subtracted from the total.
     */
     updateRowTotal = function(fields,bonus,penalties) {
-        var readFields=fields,penaltiesExist=false;
+        var readFields=fields;
         if (!fields || fields.length===0 ) {return;}
         if( penalties && penalties.length>0){
-            penaltiesExist=true;
             readFields=readFields.concat(penalties);
         }
         getAttrs(readFields,function(v){
@@ -11756,35 +11777,35 @@ var PFSheet = PFSheet || (function(){
 				return true;
 			}
 		}
-		//console.log("DEBUG: GOOD ID:" + id + " for section " + section);
 		return false;
 	},
 		
-	/* setRepeatingRowDefaultFields
-	* sets the _new_flag to 1, _row_id, and _row_index fields of a repeating section row
-	* only if _new_flag is blank or 0.
-	* @id {string} = the ID of the row via getSectionIDs
-	* @section {string} = the name of the repeating section that appears after "repeating_"
-	* @index {int} = the index of this row
-	* @forceReset {bool} = if true then set the row fields no matter what _new_flag is set to.
-	*/
-    setRepeatingRowDefaultFields =function(section,id,index,forceReset) {
+    setRepeatingRowDefaultFields =function(section,id,forceReset) {
          var newflag  = "repeating_"+section +"_" +id+"_new_flag",
          rowid = "repeating_"+section +"_" +id+"_row_id",
-         rowindex = "repeating_"+section +"_" +id+"_row_index",
-         fieldNames=[newflag,rowid,rowindex];
+         fieldNames=[newflag,rowid];
          getAttrs(fieldNames,function(v){
             var setter={};
-            if ( !(v[newflag]) || forceReset ) {
+            if ( v[newflag]!="1" || forceReset ) {
                 setter[rowid]= id;
-                setter[rowindex]=index;
-                setter[newflag]=1;
+                setter[newflag]="1";
                 setAttrs(setter);
             }
          });
-    },
-
-
+    },		
+    handleRepeatingRowOrdering = function(section,forceReset) {
+        getSectionIDs("repeating_"+section,function(ids){
+            ids.forEach(function(id,index){
+				if (isBadRowId(section,id,false)) {
+					console.log("ERROR: handleRepeatingRowOrdering invalid id:"+id);
+					return;
+				}
+				setRepeatingRowDefaultFields(section,id,forceReset);
+            });
+        });
+    },		
+		
+	
     /*updateSize
     * When size attribute is changed, update CMD-size, size_display, size_skill, size_skill_double
     */
@@ -11808,30 +11829,6 @@ var PFSheet = PFSheet || (function(){
         });
     },
 
-    /* updateConditionAbilityPenalty
-    * Sets DEX-cond and STR-cond for fatigued, entangled, and grappled
-    */
-    updateConditionAbilityPenalty = function() {
-        var readFields=["STR-cond","DEX-cond","condition-Fatigued","condition-Entangled","condition-Grappled"];
-        getAttrs(readFields,function(v){
-            var setter={},setAny=0,
-            strMod = (parseInt(v["condition-Fatigued"],10)||0),
-            dexMod = (parseInt(v["condition-Entangled"],10)||0) +
-                       (parseInt(v["condition-Grappled"],10)||0);
-            dexMod += strMod;
-            dexMod = dexMod * -2;
-            strMod = strMod * -2;
-            if (dexMod !== (parseInt(v["DEX-cond"],10)||0)) {
-                setter["DEX-cond"]=dexMod;
-                setAny=1;
-            }
-            if (strMod !== (parseInt(v["STR-cond"],10)||0)) {
-                setter["STR-cond"]=strMod;
-                setAny=1;
-            }
-            if (setAny) { setAttrs(setter);}
-        });
-    },
 
     /* updateAbility
 	 * Updates the final ability score, ability modifier, condition column based on entries in ability grid plus conditions and buffs.
@@ -11839,32 +11836,60 @@ var PFSheet = PFSheet || (function(){
 	 * Note: Ability value is not affected by damage and penalties, instead only modifier is affected.
      * @ability {string} 3 letter abbreviation for one of the 6 ability scores.
      */
-    updateAbility = function(ability) {
-        var readFields=[ability+"-base",ability+"-enhance",ability+"-misc",ability+"-damage",ability+"-penalty",ability+"-drain",ability, ability+"-mod", ability+"-cond","buff_"+ability+"-total","FF-ability"];
-
-        getAttrs(readFields, function (values){
+    updateAbility = function(ability,columnUpdated,columnVal) {
+        getAttrs([ability+"-base",ability+"-enhance",ability+"-misc",ability+"-damage",ability+"-penalty"
+			,ability+"-drain",ability, ability+"-mod", ability+"-cond","buff_"+ability+"-total"], function (values){
             var base = (parseInt(values[ability+"-base"],10)||0) +
                     (parseInt(values[ability+"-enhance"],10)||0) +
                     (parseInt(values[ability+"-misc"],10)||0) +
-                    (parseInt(values["buff_"+ability+"-total"],10)||0) +
-                    (parseInt(values[ability+"-drain"],10)||0),
-                dmg =  -1 * Math.floor(Math.abs(parseInt(values[ability+"-damage"],10)||0)/2),
-                pen =  -1 * Math.floor(Math.abs(parseInt(values[ability+"-penalty"],10)||0)/2),
-                cond= -1 * Math.floor(Math.abs(parseInt(values[ability+"-cond"],10)||0)/2),
+                    (parseInt(values[ability+"-drain"],10)||0) +
+					(columnUpdated==="buff"?columnVal:(parseInt(values["buff_"+ability+"-total"],10)||0))
+                ,dmg =   Math.floor(Math.abs(parseInt(values[ability+"-damage"],10)||0)/2)
+                ,pen =   Math.floor(Math.abs(parseInt(values[ability+"-penalty"],10)||0)/2)
+                ,cond= (columnUpdated==="cond"?columnVal:( Math.floor(Math.abs(parseInt(values[ability+"-cond"],10)||0)/2)))
                 //use 99 (never happen) to make sure we update if there's a problem
-                currAbility=parseInt(values[ability],10)||99,
-                currMod = parseInt(values[ability+"-mod"],10)||99,
-                mod,setAny=0,setter={};
-            //no abs for floor of base - 10
-            mod = Math.floor((base -10)/2) + dmg + pen +cond;
+                ,currAbility=parseInt(values[ability],10)||99
+                ,currMod = parseInt(values[ability+"-mod"],10)||99
+                ,mod= Math.floor((base -10)/2) - dmg - pen -cond
+				,setAny=0,setter={};
 
-            if (currAbility !== base){setter[ability]=base;setAny++;}
-            if (currMod !== mod){setter[ability+"-mod"]=mod;setAny++;}
+
+            if (currAbility !== base){setter[ability]=base;setAny=1;}
+            if (currMod !== mod){setter[ability+"-mod"]=mod;setAny=1;}
 
             if (setAny){setAttrs(setter);}
         });
     },
 
+	
+	
+    /* updateConditionAbilityPenalty
+    * Sets DEX-cond and STR-cond for fatigued, entangled, and grappled
+    */
+    updateConditionAbilityPenalty = function() {
+        getAttrs(["STR-cond","DEX-cond","condition-Fatigued","condition-Entangled","condition-Grappled"],function(v){
+            var setter={},setAny=0
+            ,strMod = (parseInt(v["condition-Fatigued"],10)||0)
+            ,dexMod = (parseInt(v["condition-Entangled"],10)||0) +
+                       (parseInt(v["condition-Grappled"],10)||0) + strMod
+			,dexAbMod=dexMod*-2
+			,strAbMod=strMod*-2;
+            if (dexAbMod !== (parseInt(v["DEX-cond"],10)||0)) {
+                setter["DEX-cond"]=dexAbMod;
+                setAny=1;
+            }
+            if (strAbMod !== (parseInt(v["STR-cond"],10)||0)) {
+                setter["STR-cond"]=strAbMod;
+                setAny=1;
+            }
+            if (setAny) { 
+				setAttrs(setter);
+				//short circuit 
+				updateAbility("DEX","cond",dexMod);
+				updateAbility("STR","cond",strMod);
+			}
+        });
+    },
 
 
     /* updateBuff
@@ -11876,8 +11901,8 @@ var PFSheet = PFSheet || (function(){
      * @row {number} The row number of the change.
      */
     updateBuff = function (buffname, row) {
-        var fieldtoUpdate = "buff"+row+"_"+buffname;
-        var fieldtoRead = fieldtoUpdate + "_macro-text";
+        var fieldtoUpdate = "buff"+row+"_"+buffname
+        ,fieldtoRead = fieldtoUpdate + "_macro-text";
         SWUtils.evaluateAndSetNumber(fieldtoRead,fieldtoUpdate);
     },
 
@@ -11888,8 +11913,8 @@ var PFSheet = PFSheet || (function(){
      * @row {number} The buff row toggled (X in buffX_Toggle )
       */
     updateBuffRow = function(row) {
-        var toggle="buff"+row+"_Toggle";
-        var buffFlds = ["buff"+row+"_Melee", "buff"+row+"_Ranged","buff"+row+"_DMG","buff"+row+"_AC","buff"+row+"_HP-temp","buff"+row+"_Fort",
+        var toggle="buff"+row+"_Toggle"
+        ,buffFlds = ["buff"+row+"_Melee", "buff"+row+"_Ranged","buff"+row+"_DMG","buff"+row+"_AC","buff"+row+"_HP-temp","buff"+row+"_Fort",
         "buff"+row+"_Ref","buff"+row+"_Will","buff"+row+"_STR","buff"+row+"_DEX","buff"+row+"_CON","buff"+row+"_INT","buff"+row+"_WIS","buff"+row+"_CHA",
         "buff"+row+"_Touch","buff"+row+"_CMD","buff"+row+"_Check","buff"+row+"_CasterLevel",
         toggle];
@@ -11897,7 +11922,7 @@ var PFSheet = PFSheet || (function(){
         getAttrs(buffFlds,function(v){
             var numFlds = buffFlds.length - 1; // -1 to skip toggle field at end of buffFlds array
             var i,numSet=0, valuesToSet ={};
-            if (v[toggle] == 0) {
+            if (v[toggle] == "0") {
                 for (i=0;i<numFlds;i++) {
                     if (v[buffFlds[i]] !== 0) {valuesToSet[buffFlds[i]]=0;numSet++;}
                 }
@@ -11924,7 +11949,39 @@ var PFSheet = PFSheet || (function(){
     updateBuffColumn = function (col){
         var fields=["buff_"+col+"-total","buff1_"+col,"buff2_"+col,"buff3_"+col,"buff4_"+col,"buff5_"+col,
             "buff6_"+col,"buff7_"+col,"buff8_"+col,"buff9_"+col,"buff10_"+col];
-        updateRowTotal(fields);
+        //updateRowTotal(fields);
+		getAttrs(fields,function(v){
+			var currValue= parseInt(v[fields[0]],10)
+				,newValue=0,setter={},i=1;
+            for(i=1;i<11;i++){
+				//console.log("at"+i);
+                newValue+= parseFloat(v[fields[i]])||0;
+				//console.log("i:"+i+", val="+newValue);
+            }
+            if (isNaN(currValue) || currValue !== newValue) {
+                setter[fields[0]]=newValue;
+                setAttrs(setter);
+				switch(col) {
+					case "STR":
+					case "DEX":
+					case "CON":
+					case "INT":
+					case "WIS":
+					case "CHA":
+						updateAbility(col,"buff",newValue);
+						break;
+					//cannot do this in case the user hit "update row total"
+					//then two or more could be updated, which breaks the repeating sections
+					//case "Melee":
+					//	updateAttack("melee",true,newValue);
+					//	updateAttack("CMB",true,newValue);
+					//	break;
+					//case "Ranged":
+					//	updateAttack("ranged",true,newValue);
+					//	break;
+				}
+            }
+		});
     },
 
 
@@ -12166,7 +12223,7 @@ var PFSheet = PFSheet || (function(){
      * if not proficient sets attack penalty
      * for backward compatiblity, proficiency is string and 0 is proficient, anything else non proficient
      */
-    updateArmor=function(){
+    updateArmor=function(eventInfo){
         getAttrs(["shield-equipped", "shield-acbonus", "shield-max-dex", "shield-acp", "shield-spell-fail", "shield-proficiency",
          "shield2-equipped", "shield2-acbonus", "shield2-max-dex", "shield2-acp", "shield2-spell-fail", "shield2-proficiency",
          "armor-equipped", "armor-acbonus", "armor-max-dex", "armor-acp", "armor-spell-fail", "armor-proficiency",
@@ -12303,6 +12360,8 @@ var PFSheet = PFSheet || (function(){
             if (isNaN(currAttk) || currAttk !== attkEffectTot) {
                 setters["attk-effect-total"]=attkEffectTot;
                 setAttrs(setters);
+				//short circuit 
+				//updateRepeatingWeaponAttacks("attk-effect-total",attkEffectTot);
             }
         });
     },
@@ -12320,6 +12379,8 @@ var PFSheet = PFSheet || (function(){
             if (isNaN(currDmg) || currDmg !== dmgEffectTot) {
                 setters["dmg-effect-total"]=dmgEffectTot;
                 setAttrs(setters);
+				//short circuit
+				//updateRepeatingWeaponDamages("dmg-effect-total",dmgEffectTot);
             }
         });
     },
@@ -12354,6 +12415,7 @@ var PFSheet = PFSheet || (function(){
             ,"condition-Wounds"];
         updateRowTotal(adds,0,subtracts);
     },
+	
     updateConditionAttackNote = function () {
         getAttrs(["condition-Grappled","condition-Invisible"],function(v){
             var setter={},setAny=0,gnote,cnote;
@@ -12377,57 +12439,55 @@ var PFSheet = PFSheet || (function(){
         });
     },
 
+	
+	attackGridFields={
+		"melee":{"size":"size","atk":"attk-melee","buff":"buff_Melee-total","abilityMod":"melee-ability-mod","misc":"attk-melee-misc"}
+		,"ranged":{"size":"size","atk":"attk-ranged","buff":"buff_Ranged-total","abilityMod":"ranged-ability-mod","misc":"attk-ranged-misc"}
+		,"CMB":{"size":"CMD-size","atk":"CMB","buff":"buff_Melee-total","abilityMod":"CMB-ability-mod","misc":"attk-CMB-misc"}
+	},
+	
     /* updateAttack
      * Updates the attack type totals at top of attack page for one row of grid
      *
      * @attype = the type of attack: melee, ranged, CMB case sensitive
      */
     updateAttack=function(attype) {
-        var  bufftype,bufffield,fields
-        ,sizeField="size"
-        ,atkField="attk-"+attype;
-        //var sizeMult=1;
-        if (attype=="melee") {bufftype="Melee"; }
-        else if (attype==="ranged") {bufftype="Ranged";}
-        else if (attype==="CMB") {
-            sizeField="CMD-size";
-            bufftype="Melee";
-            atkField="CMB";
-            //sizeMult = -1;
-        }
-        else {return;}
-        bufffield="buff_"+bufftype+"-total";
-        fields=[atkField,"bab",attype+"-ability-mod","attk-"+attype+"-misc","attk-penalty",bufffield,sizeField];
-        updateRowTotal(fields);
+		console.log("at updateAttack:"+attype);
+		var fields=[attackGridFields[attype].atk,"bab","attk-penalty"
+			,attackGridFields[attype].abilityMod,attackGridFields[attype].misc
+			,attackGridFields[attype].size,attackGridFields[attype].buff];
+		console.log(fields);
+		updateRowTotal([attackGridFields[attype].atk,"bab","attk-penalty"
+			,attackGridFields[attype].abilityMod,attackGridFields[attype].misc
+			,attackGridFields[attype].size,attackGridFields[attype].buff]);
     },
 
 
 	/*handleRepeatingAttackDropdown
-	* Special case of handleRepeatingDropdown, also sets repeating damage dropdown
-	* to STR if the attack type is melee and damage dropdown is not already chosen.
-	* just to save user one step.
 	*/
-    handleRepeatingAttackDropdown = function(id){
-		var idStr=getRepeatingIDStr(id);
-		//console.log("TRACE:handleRepeatingAttackDropdown id:" + id);
+    handleRepeatingAttackDropdown = function(id,eventInfo){
+		var idStr=getRepeatingIDStr(id),prefix="repeating_weapon_"+idStr;
+		console.log("TRACE:handleRepeatingAttackDropdown id:" + id+", eventinfo is");
+		console.log(eventInfo);
 		if (isBadRowId("weapon",id,true)) {
 			console.log("ERROR: handleRepeatingAttackDropdown, invalid id:"+id);
 			return;			
 		}		
-        handleDropdown("repeating_weapon_"+idStr+"attack-type",["repeating_weapon_"+idStr+"attack-type-mod"]);
+        handleDropdown(prefix+"attack-type",prefix+"attack-type-mod");
     },
+	
     /* handleRepeatingDamageDropdown
     * this is a special case of dropdown, because it contains a possible multipler Damage ability dropdown.
     * better to split this into two
     */
-    handleRepeatingDamageDropdown=function(id,idexists) {
-        var readField,writeField,idStr=getRepeatingIDStr(id);
-		if (isBadRowId("weapon",id,!idexists)) {
+    handleRepeatingDamageDropdown=function(id) {
+        var idStr=getRepeatingIDStr(id)
+		,readField=id?"repeating_weapon_"+idStr+"damage-ability":"repeating_weapon_damage-ability"
+		,writeField= id?readField+"-mod":"repeating_weapon_damage-ability-mod";
+		if (isBadRowId("weapon",id,true)) {
 			console.log("ERROR: handleRepeatingDamageDropdown, invalid id:"+id);
 			return;			
 		}
-        readField="repeating_weapon_"+idStr+"damage-ability";
-        writeField= readField+"-mod";
         getAttrs([readField,writeField],function(v) {
             var ability= findAbilityInString (v[readField]),
                 mult = findMultiplier(v[readField]);
@@ -12439,53 +12499,77 @@ var PFSheet = PFSheet || (function(){
                 if ( dmgmod !== currentmod) {
                     setter[writeField]=dmgmod;
                     setAttrs(setter);
+					//short circuit 
+					//updateRepeatingWeaponDamage(id,"damage-ability-mod",value);
                 }
             });
          });
     },
 
-
-    updateRepeatingWeaponAttack=function(id) {
-        var idStr=getRepeatingIDStr(id),
-		currAttackEffectTotalRepField="repeating_weapon_"+idStr+"attk-effect-total-copy";
+	/*updateRepeatingWeaponAttack
+	* @id {string} optional = id of row, if blank we are within the context of the row
+	* @overrideAttr {string} optional = if we are passing in a value this is the fieldname after "repeating_weapon_"
+	* @overrideValue {number} optional = if overrideAttr then this should be a number usually int but it won't check
+	*/
+    updateRepeatingWeaponAttack=function(id,eventInfo) { 
+		//is it faster to not do the idstr each time? try it with ?:
+        var idStr=getRepeatingIDStr(id)
+		,enhanceField=id?"repeating_weapon_"+idStr+"enhance":"repeating_weapon_enhance"
+		,mwkField=id?"repeating_weapon_"+idStr+"masterwork":"repeating_weapon_masterwork"
+		,attkTypeModField=id?"repeating_weapon_"+idStr+"attack-type-mod":"repeating_weapon_attack-type-mod"
+		,attkEffectField="attk-effect-total"
+		,attkEffectCopyField=id?"repeating_weapon_"+idStr+"attk-effect-total-copy":"repeating_weapon_attk-effect-total-copy"
+		,profField=id?"repeating_weapon_"+idStr+"proficiency":"repeating_weapon_proficiency"
+		,attkMacroModField=id?"repeating_weapon_"+idStr+"attack-mod":"repeating_weapon_attack-mod"
+		,totalAttackField=id?"repeating_weapon_"+idStr+"total-attack":"repeating_weapon_total-attack"
+		;
+		
 		if (isBadRowId("weapon",id,true)) {
 			console.log("ERROR: updateRepeatingWeaponAttack, invalid id:"+id);
 			return;			
 		}
-        getAttrs(["repeating_weapon_"+idStr+"enhance",
-				"repeating_weapon_"+idStr+"masterwork",
-				currAttackEffectTotalRepField,
-				"attk-effect-total"],function(v){
-            var enhance=(parseInt(v["repeating_weapon_"+idStr+"enhance"],10)||0),
-                masterwork=(parseInt(v["repeating_weapon_"+idStr+"masterwork"],10)||0),
-                bonus=0, 
-				setter={},
-				attackEffectTotal=(parseInt(v["attk-effect-total"],10)||0),
-				currAttackEffectTotal=(parseInt(v[currAttackEffectTotalRepField],10)||0),
-                attackFields=["repeating_weapon_"+idStr+"total-attack","repeating_weapon_"+idStr+"proficiency",
-                    "repeating_weapon_"+idStr+"attack-type-mod","repeating_weapon_"+idStr+"attack-mod"];
-            bonus = Math.max(enhance,masterwork)+attackEffectTotal;
-            updateRowTotal(attackFields,bonus);
-			if (currAttackEffectTotal != attackEffectTotal) {
-				setter[currAttackEffectTotalRepField]=attackEffectTotal;
-				setAttrs(setter);
+
+		
+		getAttrs([enhanceField,mwkField,attkTypeModField,attkEffectField,attkEffectCopyField,profField,attkMacroModField,totalAttackField],function(v){
+            var enhance=(parseInt(v[enhanceField],10)||0)
+                ,masterwork=(parseInt(v[mwkField],10)||0)
+				,attackEffectTotal=(parseInt(v[attkEffectField],10)||0)
+				,currAttackEffectTotal=(parseInt(v[attkEffectCopyField],10)||0)
+				,attkTypeMod=(parseInt(v[attkTypeModField],10)||0)
+				,prof=(parseInt(v[profField],10)||0)
+				,attkMacroMod=(parseInt(v[attkMacroModField],10)||0)
+				,currTotalAttack=(parseInt(v[totalAttackField],10)||0)
+                ,newTotalAttack=0
+				,setter={},setAny=0;
+							
+            newTotalAttack = Math.max(enhance,masterwork)+attackEffectTotal + attkTypeMod +prof+attkMacroMod;
+			if (newTotalAttack!==currTotalAttack || isNaN(currTotalAttack))
+			{
+				setter[totalAttackField]=newTotalAttack;
+				setAny=1;
 			}
+			if (currAttackEffectTotal != attackEffectTotal) {
+				setter[attkEffectCopyField]=attackEffectTotal;
+				setAny=1;
+			}
+			if (setAny) {setAttrs(setter);}
         });
     },	
-    updateRepeatingWeaponAttacks = function() {
+	
+    updateRepeatingWeaponAttacks = function(eventInfo) {
 		getSectionIDs("repeating_weapon",function(ids){
 			ids.forEach(function(id,index){
 				if (isBadRowId("weapon",id,false)) {
 					console.log("ERROR: updateRepeatingWeaponAttacks, invalid id:"+id+", index:" +index);
 					return;
 				}
-				updateRepeatingWeaponAttack(id);
+				updateRepeatingWeaponAttack(id,eventInfo);
 			});
 		});
 	},
 
  
-    updateRepeatingWeaponDamage=function(id) {
+    updateRepeatingWeaponDamage=function(id,eventInfo) {
         var idStr=getRepeatingIDStr(id),
             maxname="repeating_weapon_"+idStr+"damage-ability-max",
             modname="repeating_weapon_"+idStr+"damage-ability-mod",
@@ -12505,8 +12589,9 @@ var PFSheet = PFSheet || (function(){
 				currDmgMod=(parseInt(v[dmgModCopy],10)||0);
             if (max<=0) {max=9999;}
             mod =Math.min(max,mod) + dmgEffect + dmgMod;
+			
             dmgFields=["repeating_weapon_"+idStr+"total-damage","repeating_weapon_"+idStr+"enhance",
-                "repeating_weapon_"+idStr+"damage-mod"];
+               "repeating_weapon_"+idStr+"damage-mod"];
             updateRowTotal(dmgFields,mod);
 			if (dmgMod !== currDmgMod) {
 				setter[dmgModCopy]=dmgMod;
@@ -12520,7 +12605,7 @@ var PFSheet = PFSheet || (function(){
         });
     },
 
-    updateRepeatingWeaponDamages = function() {
+    updateRepeatingWeaponDamages = function(fieldUpdated,value) {
 		getSectionIDs("repeating_weapon",function(ids){
 			ids.forEach(function(id,index){
 				if (isBadRowId("weapon",id,false)) {
@@ -12528,6 +12613,7 @@ var PFSheet = PFSheet || (function(){
 					return;
 				}
 				updateRepeatingWeaponDamage(id);
+				//updateRepeatingWeaponDamage(id,fieldUpdated,value);
 			});
 		});
 	},
@@ -12703,11 +12789,11 @@ var PFSheet = PFSheet || (function(){
     },
 	
 	findSpellClass=function(selected) {
-		if (!selected) {return -1;}
+		//if (!selected) {return -1;}
 		if (selected.indexOf("0")>=0) {return 0;}
 		if (selected.indexOf("1")>=0) {return 1;}
 		if (selected.indexOf("2")>=0) {return 2;}
-		return -1;
+		return 0;
 	},
 
 	/* ifSpellClassExists 
@@ -12907,142 +12993,107 @@ var PFSheet = PFSheet || (function(){
     },
 	
 	updateSpellPenetration=function(classidx) {
-		updateRowTotal(["spellclass-"+classidx+"-spellpen","spellclass-"+classidx+"-spellpen_bonus","spellclass-"+classidx+"-level-total"]);
+		updateRowTotal(["spellclass-"+classidx+"-SP-mod","spellclass-"+classidx+"-SP_misc","spellclass-"+classidx+"-level-total"]);
 	},
 	
 	
 
 
 
-
-
 	
 	/*updateSpell
 	* For a row in lvl-x-spells repeating sections, updates:
-	*  def_cast_dc, def_cast, savedc, casterlevel, Concentration,spellPen
+	*  cast_def_dc, cast_def, savedc, casterlevel, Concentration,spellPen
 	* @section {string} =  lvl-0-spells , lvl-1-spells, etc
 	* @id {string} optional = id of row, can be omitted if we're already in row context
 	*/
-	updateSpell=function(section,id) {
-		var idStr, spellclassField,  spellLevelField, classLevelFields;
-		idStr=getRepeatingIDStr(id);
-		//first get spell level and spell class
-		spellclassField= "repeating_"+section+"_"+idStr+"spellclass";
-		spellLevelField="repeating_"+section+"_"+idStr+"spell_level";
-		//console.log("at updateSpell look for " + spellclassField + ", and " +spellLevelField );
-	
-		classLevelFields=[spellLevelField,spellclassField];
-		getAttrs(classLevelFields,function(va){
-			//console.log(va);
-			var spellLevel,classNum,getFields,hasClass=true
-			,classDCField,spellDCModField,spellDCField
-			,classCLField,spellCLModField,spellCLField
-			,classConField,spellConModField,spellConField
-			,classDefConModField,spellDefConField,spellDefCastDCField
-			,classSpellPenField,spellSpellPenModField,spellSpellPenField;
-			
-			//next get level of spellcasting class, fields that depend on it, and other fields
-			spellLevel=parseInt(va[spellLevelField],10)||0;
-			classNum = findSpellClass(va[spellclassField]);
-			if (isNaN(classNum) || classNum < 0) {
-				hasClass=false;
-			}
-			//console.log("values are spellLevel:" + spellLevel + ", classNum:"+classNum);
+	updateSpell=function(section,id,eventInfo) {
+		var idStr=getRepeatingIDStr(id)
+			,prefix="repeating_"+section+"_"+idStr
+			,spellclassField= prefix+"spellclass"
+			,spellLevelField=prefix+"spell_level";
+		getAttrs([spellLevelField,spellclassField],function(va){
+			var spellLevel=(parseInt(va[spellLevelField],10)||0)
+				,classNum= findSpellClass(va[spellclassField])
+				,hasClass=  (isNaN(classNum) || classNum < 0)?false:true
+				,spellDefCastDCField=prefix+"cast_def_dc"
+				,spellDefConField=prefix+"cast_def-mod"
+				,spellDCField=prefix+"savedc"
+				,spellDCUserField=prefix+"DC_misc"
+				,spellCLField=prefix+"casterlevel"
+				,spellCLUserField=prefix+"CL_misc"
+				,spellConField=prefix+"Concentration-mod"
+				,spellConUserField=prefix+"Concentration_misc"
+				,spellSpellPenField=prefix+"SP-mod"
+				,spellSpellPenUserField=prefix+"SP_misc"
+				,classCLField="spellclass-"+classNum+"-level-total"
+				,classDCField="spellclass-"+classNum+"-level-"+spellLevel+"-savedc"
+				,classConField = "Concentration-"+classNum
+				,classDefConField = "Concentration-"+classNum+"-def"
+				,classSpellPenField = "spellclass-"+classNum+"-SP_misc";
 
-			//get fields
-			spellDefCastDCField="repeating_"+section+"_"+idStr+"def_cast_dc";
-			spellDefConField="repeating_"+section+"_"+idStr+"def_cast";
-			spellDCField="repeating_"+section+"_"+idStr+"savedc";
-			spellDCModField="repeating_"+section+"_"+idStr+"DC-mod";
-			spellCLField="repeating_"+section+"_"+idStr+"casterlevel";
-			spellCLModField="repeating_"+section+"_"+idStr+"CL-mod";
-			spellConField="repeating_"+section+"_"+idStr+"Concentration";
-			spellConModField="repeating_"+section+"_"+idStr+"Concentration-mod";
-			spellSpellPenModField="repeating_"+section+"_"+idStr+"SP-mod";
-			spellSpellPenField="repeating_"+section+"_"+idStr+"spellPen";
-			
-			getFields=[spellDCField,spellDCModField,spellCLField,spellCLModField
-			,spellConField,spellConModField,spellDefConField,spellDefCastDCField
-			,spellSpellPenField,spellSpellPenModField];
-			
-			if (hasClass) {
-				classDCField="spellclass-"+classNum+"-level-"+spellLevel+"-savedc";
-				classCLField = "spellclass-"+classNum+"-level-total";
-				classConField = "Concentration-"+classNum;
-				classDefConModField = "Concentration-"+classNum+"-def";
-				classSpellPenField = "spellclass-"+classNum+"-spellpen";
-				getFields = getFields.concat([classDCField,classCLField,classConField,classDefConModField,classSpellPenField]);
-			}	 
-			console.log(getFields);
-			
-			getAttrs(getFields,function(v){
-				var newDC, currDC ,classDC=0
-				,newCL,currCL,classCL=0
-				,classLevelDelta=0
-				,newCon,currCon,classCon=0
-				,newDefCon,currDefCon,classDefConMod=0
-				,defDC=0,currdefDC=0
-				,newSpellPen,currSpellPen,classSpellPen=0
-				,setter={},setAny=0;
-				//console.log(v);
-				currDC=parseInt(v[spellDCField],10);
-				currCL=parseInt(v[spellCLField],10);
-				currCon=parseInt(v[spellConField],10);
-				currDefCon=parseInt(v[spellDefConField],10);				
-				currdefDC=parseInt(v[spellDefCastDCField],10);
-				currSpellPen=parseInt(v[spellSpellPenField],10);
-				
-				if (hasClass) {
-					classDC=parseInt(v[classDCField],10)||0;
-					classCL=parseInt(v[classCLField],10)||0;
-					classCon=parseInt(v[classConField],10)||0;
-					classDefConMod=parseInt(v[classDefConModField],10)||0;
-					classSpellPen=parseInt(v[classSpellPenField],10)||0;
-				}
-				//DC to cast defensively
-				defDC = 15+(spellLevel*2);
+			getAttrs([spellDCField,spellDCUserField,spellCLField,spellCLUserField
+				,spellConField,spellConUserField,spellDefConField,spellDefCastDCField
+				,spellSpellPenField,spellSpellPenUserField,classDCField,classCLField
+				,classConField,classDefConField,classSpellPenField]	,function(v){
+				var newDC,newCL,newCon,newDefCon,newSpellPen
+				,currDC=parseInt(v[spellDCField],10)
+				,currCL=parseInt(v[spellCLField],10)
+				,currCon=parseInt(v[spellConField],10)
+				,currDefCon=parseInt(v[spellDefConField],10)
+				,currdefDC=parseInt(v[spellDefCastDCField],10)
+				,currSpellPen=parseInt(v[spellSpellPenField],10)
+				,classDC=(parseInt(v[classDCField],10)||0)
+				,classCL=(parseInt(v[classCLField],10)||0)
+				,classCon=(parseInt(v[classConField],10)||0)
+				,classDefConMod=(parseInt(v[classDefConField],10)||0)
+				,classSpellPen=(parseInt(v[classSpellPenField],10)||0)
+				,defDC = 15+(spellLevel*2)
+				,classLevelDelta=0,setter={},setAny=0
+				;
 				if (defDC !== currdefDC || isNaN(currdefDC)) {
 					setter[spellDefCastDCField]=defDC;
-					setAny++;
+					setAny=1;
 				}
 				//Caster level check mod
-				newCL = (parseInt(v[spellCLModField],10)||0) + classCL;
+				newCL = (parseInt(v[spellCLUserField],10)||0) + classCL;
 				if (newCL !== currCL || isNaN(currCL)) {
 					classLevelDelta= newCL - (currCL||0);
 					setter[spellCLField]=newCL;
-					setAny++;
+					setAny=1;
 				}
 
 				//DC to save
-				newDC=   (parseInt(v[spellDCModField],10)||0) + classDC;
+				newDC=   (parseInt(v[spellDCUserField],10)||0) + classDC;
 				if (newDC !== currDC || isNaN(currDC)) {
 					setter[spellDCField]=newDC;
-					setAny++;
+					setAny=1;
 				}
 				//Concentration check mod
-				newCon = (parseInt(v[spellConModField],10)||0) + classCon + classLevelDelta;
+				newCon = (parseInt(v[spellConUserField],10)||0) + classCon + classLevelDelta;
 				if (newCon !== currCon || isNaN(currCon)) {
 					setter[spellConField]=newCon;
-					setAny++;
+					setAny=1;
 				}
 				//concentration bonus when defensive casting
 				//no need to add class level delta, since it's built into newCon
 				newDefCon =  newCon+classDefConMod ;
 				if (newDefCon !== currDefCon || isNaN(currDefCon)) {
 					setter[spellDefConField]=newDefCon;
-					setAny++;
+					setAny=1;
 				}
 				
 				//Spell penetration check mod 
-				newSpellPen = (parseInt(v[spellSpellPenModField],10)||0) + classSpellPen +classLevelDelta;
+				newSpellPen =  newCL + classSpellPen +  (parseInt(v[spellSpellPenUserField],10)||0) ;
 				if (newSpellPen !== currSpellPen || isNaN(currSpellPen)) {
 					setter[spellSpellPenField]=newSpellPen;
-					setAny++;
+					setAny=1;
 				}
 				
 				if (setAny) {
 					setAttrs(setter);
 				}
+				
 			});
 			
 		});
@@ -13064,8 +13115,56 @@ var PFSheet = PFSheet || (function(){
             });
         });
 	},
+		
+	/*checkIsNewRow
+	* Within row context of a repeating section item, 
+	* if _new_flag is blank or 0 then call handleRepeatingRowOrdering
+	* @section {string} = the name of the repeating section that appears after "repeating_"
+	* @eventinfo = from the event that launched this
+	*/
+    checkIsNewRow = function(section,eventInfo) {
+		if (!section || !eventInfo){return;	}
+		//console.log("checkIsNewRow: event:"+eventInfo.sourceAttribute);	
+		getAttrs(["repeating_"+section+"_new_flag"],function(v){
+			var startIdx,endIdx,newid,setter={};
+			if (v["repeating_"+section+"_new_flag"]!="1") {
+				startIdx=("repeating_"+section+"_").length;
+				endIdx = eventInfo.sourceAttribute.indexOf("_",startIdx);
+				if (endIdx <= 0) {return;}
+				newid = eventInfo.sourceAttribute.substring(startIdx,endIdx);
+                setter["repeating_"+section+"_row_id"]= newid;
+                setter["repeating_"+section+"_new_flag"]="1";
+                setAttrs(setter);
+				if (section.match(/lvl-.-spell/)){ updateSpell(section); }
+			}
+		});
+    },
+		
 	
+	
+	/*recalculateSpell
+	* sets fields
+	*/
+	recalculateSpell = function (section,id){
+		var  spellLevelField="repeating_"+section+"_"+id+"_spell_level",
+		classLevelField="repeating_"+section+"_"+id+"_spellclass",
+		dcModField="repeating_"+section+"_"+id+"_DC-mod",
+		dcMiscField="repeating_"+section+"_"+id+"_DC_misc"
+		;
+		getAttrs([spellLevelField,classLevelField,dcModField,dcMiscField],function(v){
+			var setter={},currLevel=parseInt(v[spellLevelField],10),
+			currDCMod=parseInt(v[dcModField],10),
+			currDCMisc=parseInt(v[dcMiscField],10);
+			
 
+			
+			if (isNaN(currLevel) ) {
+				setter[spellLevelField]=spellLevel;
+				setAttrs(setter);
+			}
+		});
+	},
+	
 	/*recalculateSpellLevels
 	* ensures that spell_level is set on each spell repeating row, since it was changed to an editable field
 	* @spellLevel {int} = the DEFAULT spell level of the repeating section, from 0 to 9
@@ -13074,22 +13173,21 @@ var PFSheet = PFSheet || (function(){
 		var section="lvl-"+spellLevel+"-spells";
 		getSectionIDs("repeating_"+section,function(ids){
             ids.forEach(function(id,index){
-				var  spellLevelField="repeating_"+section+"_"+id+"_spell_level";
-				getAttrs([spellLevelField],function(v){
-					var setter={},currLevel=parseInt(v[spellLevelField],10);
-					if (isNaN(currLevel) ) {
-						setter[spellLevelField]=spellLevel;
-						setAttrs(setter);
-					}
-				});
+				recalculateSpell(section,id);
             });
         });
+		getSectionIDs("repeating_"+section,function(ids){
+            ids.forEach(function(id,index){
+				updateSpell(section,id);
+            });
+        });		
 	},
 		
 	/*recalculateSpellLevelsAll
 	* calls recalculateSpellLevels for each level
 	*/
 	recalculateSpellLevelsAll = function() {
+		var i=0;
 		for (i=0;i<10;i++) {
 			recalculateSpellLevels(i);
 		}
@@ -13105,7 +13203,7 @@ var PFSheet = PFSheet || (function(){
                 var readField;
                 ids.forEach(function(id,index){
 					if (isBadRowId("weapon",id,false)) {
-						console.log("ERROR: updateRepeatingWeaponDamages, invalid id:"+id+", index:" +index);
+						console.log("ERROR: recalculateRepeatingWeapons, invalid id:"+id+", index:" +index);
 						return;
 					}
                     //console.log("TRACE: recalculateRepeatingWeapons id="+id);
@@ -13115,7 +13213,7 @@ var PFSheet = PFSheet || (function(){
 					SWUtils.setAttributeNumber(readField+"DMG-mod-copy",(parseInt(v["DMG-mod"],10)||0));					
                     SWUtils.evaluateAndSetNumber(readField+"damage",readField+"damage-mod");
                     SWUtils.evaluateAndSetNumber(readField+"attack",readField+"attack-mod");
-                    handleRepeatingDropdown(id,"weapon","attack-type","attack-type-mod");
+					handleDropdown(readField+"attack-type",readField+"attack-type-mod");
                     handleRepeatingDamageDropdown(id);
                     updateRepeatingWeaponAttack(id);
                     updateRepeatingWeaponDamage(id);
@@ -13133,69 +13231,20 @@ var PFSheet = PFSheet || (function(){
     recalculateRepeatingMaxUsed=function(section){
         getSectionIDs("repeating_"+section,function(ids){
             ids.forEach(function(id,index){
+				var prefix="repeating_"+section +"_" +id;
 				if (isBadRowId(section,id,false)) {
 					console.log("ERROR: recalculateRepeatingMaxUsed, invalid id:"+id+", index:" +index);
 					return;
 				}
-                //console.log("recalculatemaxused section:" + section+", id:"+id);
-                handleRepeatingMacro(id,section,"max-calculation","used_max");
+				SWUtils.evaluateAndSetNumber(prefix+"_max-calculation",prefix+"_used_max");
             });
         });
     },
 
 	
-	/*handleRepeatingRowOrdering
-	* loops through all rows and calls setRepeatingRowDefaultFields
-	* @section {string} = the name of the repeating section that appears after "repeating_"
-	* @forceReset {bool} = if true then set the row fields no matter what _new_flag is set to.	
-	*/
-    handleRepeatingRowOrdering = function(section,forceReset) {
-        getSectionIDs("repeating_"+section,function(ids){
-            ids.forEach(function(id,index){
-				if (isBadRowId(section,id,false)) {
-					console.log("ERROR: handleRepeatingRowOrdering invalid id:"+id);
-					return;
-				}
-				setRepeatingRowDefaultFields(section,id,index,forceReset);
-            });
-        });
-    },		
-
-	/*checkIsNewRow
-	* Within row context of a repeating section item, 
-	* if _new_flag is blank or 0 then call handleRepeatingRowOrdering
-	* @section {string} = the name of the repeating section that appears after "repeating_"
-	*/
-    checkIsNewRow = function(section) {
-		if (!section) {return;}
-        var fieldname="repeating_"+section+"_new_flag";
-		//console.log("TRACE: At checkIsNewRow for section " + section);
-        getAttrs([fieldname],function(v) {
-			var setter={};
-            if (!( v[fieldname]) || v[fieldname]=="0" ) {
-                handleRepeatingRowOrdering(section);
-            }
-        });
-    },
-
 
 	
-	/*
-	allskills=[ "Acrobatics","Appraise","Bluff","Climb","Craft","Craft2"
-			,"Craft3","Diplomacy","Disable-Device","Disguise","Escape-Artist"
-			,"Fly","Handle-Animal","Heal","Intimidate","Linguistics"
-			,"Knowledge-Arcana","Knowledge-Dungeoneering","Knowledge-Engineering"
-			,"Knowledge-Geography","Knowledge-History","Knowledge-Local"
-			,"Knowledge-Nature","Knowledge-Nobility","Knowledge-Planes"
-			,"Knowledge-Religion","Perception","Perform","Perform2","Perform3"
-			,"Profession","Profession2","Profession3","Ride","Sense-Motive"
-			,"Sleight-of-Hand","Spellcraft","Stealth","Survival","Swim"
-			,"Use-Magic-Device","Misc-Skill-0","Misc-Skill-1","Misc-Skill-2"
-			,"Misc-Skill-3","Misc-Skill-4","Misc-Skill-5","Artistry","Lore"
-			,"CS-Acrobatics","CS-Athletics","CS-Finesse","CS-Influence"
-			,"CS-Nature","CS-Perception","CS-Performance","CS-Religion"
-			,"CS-Society","CS-Spellcraft","CS-Stealth","CS-Survival"],
-			*/
+			
     recalculateSkills = function() {	
         handleDropdown("Acrobatics-ability",["Acrobatics-ability-mod"]);
         handleDropdown("Artistry-ability",["Artistry-ability-mod"]);
@@ -13455,6 +13504,9 @@ var PFSheet = PFSheet || (function(){
         updateBuffColumn("CasterLevel");
     },
     recalculateSheet = function(oldversion) {
+		if (version === 0.21 && oldversion === 0.20 ) {
+			return; 
+		}
         if (oldversion < 0.15) {
 
             
@@ -13542,14 +13594,45 @@ var PFSheet = PFSheet || (function(){
 		}
 		if (oldversion < 0.20) {
             recalculateRepeatingWeapons();
-			handleRepeatingRowOrdering("weapon",true);
             handleRepeatingRowOrdering("class-ability",true);
             handleRepeatingRowOrdering("feat",true);
             handleRepeatingRowOrdering("racial-trait",true);
             handleRepeatingRowOrdering("trait",true);
             handleRepeatingRowOrdering("item",true);
 		}
-		
+		/*
+		if (oldversion < 0.30) {
+     
+            handleConcentrationAbilityDropdown(0);
+            handleConcentrationAbilityDropdown(1);
+            handleConcentrationAbilityDropdown(2);
+            updateCasterLevel(0);
+            updateCasterLevel(1);
+            updateCasterLevel(2);
+            updateConcentration(0);
+            updateConcentration(1);
+            updateConcentration(2);
+            updateSaveDCs(0);
+            updateSaveDCs(1);
+            updateSaveDCs(2);
+			recalculateSpellLevelsAll();
+			
+            handleRepeatingRowOrdering("lvl-0-spells",true);
+            handleRepeatingRowOrdering("lvl-1-spells",true);
+            handleRepeatingRowOrdering("lvl-2-spells",true);
+            handleRepeatingRowOrdering("lvl-3-spells",true);
+            handleRepeatingRowOrdering("lvl-4-spells",true);
+            handleRepeatingRowOrdering("lvl-5-spells",true);
+            handleRepeatingRowOrdering("lvl-6-spells",true);
+            handleRepeatingRowOrdering("lvl-7-spells",true);
+            handleRepeatingRowOrdering("lvl-8-spells",true);
+            handleRepeatingRowOrdering("lvl-9-spells",true);
+            handleRepeatingRowOrdering("npc-spell-like-abilities",true);
+            handleRepeatingRowOrdering("npc-spells1",true);
+            handleRepeatingRowOrdering("npc-spells2",true);
+			
+        }
+		*/
     },
 
 
@@ -13589,11 +13672,8 @@ var PFSheet = PFSheet || (function(){
     return {
         util:{findAbilityInString:findAbilityInString,
             findMultiplier:findMultiplier,
-            getDropdownVal:getDropdownVal,
             recalculateSheet:recalculateSheet,
             updateRowTotal:updateRowTotal,
-            handleRepeatingDropdown:handleRepeatingDropdown,
-            handleRepeatingMacro:handleRepeatingMacro,
 			recalculateAllBuffs:recalculateAllBuffs,
 			isBadRowId:isBadRowId
             },
@@ -13617,6 +13697,7 @@ var PFSheet = PFSheet || (function(){
         updateConditionsSavePenalty:updateConditionsSavePenalty,
         updateSave:updateSave,
         updateConditionDefensePenalty:updateConditionDefensePenalty,
+		handleDefenseDropdown:handleDefenseDropdown,
         updateAttack:updateAttack,
         updateDamage:updateDamage,
         updateDamageNote:updateDamageNote,
@@ -13646,7 +13727,6 @@ var PFSheet = PFSheet || (function(){
         updateCastingPenaltyNote:updateCastingPenaltyNote,
 		updateSpell:updateSpell,
 		updateSpells:updateSpells,
-        handleRepeatingRowOrdering:handleRepeatingRowOrdering,
         checkIsNewRow:checkIsNewRow,
         checkUpdate:checkUpdate
     };
@@ -13654,48 +13734,6 @@ var PFSheet = PFSheet || (function(){
 
 
 
-//set repeating IDS
-
-on("change:repeating_class-ability",function() { PFSheet.checkIsNewRow("class-ability");});
-on("remove:repeating_class-ability",function() { PFSheet.handleRepeatingRowOrdering("class-ability",true);});
-on("change:repeating_weapon",function() { PFSheet.checkIsNewRow("weapon");});
-on("remove:repeating_weapon",function() { PFSheet.handleRepeatingRowOrdering("weapon",true);});
-on("change:repeating_feat",function() { PFSheet.checkIsNewRow("feat");});
-on("remove:repeating_feat",function() { PFSheet.handleRepeatingRowOrdering("feat",true);});
-on("change:repeating_racial-trait",function() { PFSheet.checkIsNewRow("racial-trait");});
-on("remove:repeating_racial-trait",function() { PFSheet.handleRepeatingRowOrdering("racial-trait",true);});
-on("change:repeating_trait",function() { PFSheet.checkIsNewRow("trait");});
-on("remove:repeating_trait",function() { PFSheet.handleRepeatingRowOrdering("trait",true);});
-on("change:repeating_item",function() { PFSheet.checkIsNewRow("item");});
-on("remove:repeating_item",function() { PFSheet.handleRepeatingRowOrdering("item",true);});
-on("change:repeating_lvl-0-spells",function() { PFSheet.checkIsNewRow("lvl-0-spells");});
-on("remove:repeating_lvl-0-spells",function() { PFSheet.handleRepeatingRowOrdering("lvl-0-spells",true);});
-on("change:repeating_lvl-1-spells",function() { PFSheet.checkIsNewRow("lvl-1-spells");});
-on("remove:repeating_lvl-1-spells",function() { PFSheet.handleRepeatingRowOrdering("lvl-1-spells",true);});
-on("change:repeating_lvl-2-spells",function() { PFSheet.checkIsNewRow("lvl-2-spells");});
-on("remove:repeating_lvl-2-spells",function() { PFSheet.handleRepeatingRowOrdering("lvl-2-spells",true);});
-on("change:repeating_lvl-3-spells",function() { PFSheet.checkIsNewRow("lvl-3-spells");});
-on("remove:repeating_lvl-3-spells",function() { PFSheet.handleRepeatingRowOrdering("lvl-3-spells",true);});
-on("change:repeating_lvl-4-spells",function() { PFSheet.checkIsNewRow("lvl-4-spells");});
-on("remove:repeating_lvl-4-spells",function() { PFSheet.handleRepeatingRowOrdering("lvl-4-spells",true);});
-on("change:repeating_lvl-5-spells",function() { PFSheet.checkIsNewRow("lvl-5-spells");});
-on("remove:repeating_lvl-5-spells",function() { PFSheet.handleRepeatingRowOrdering("lvl-5-spells",true);});
-on("change:repeating_lvl-6-spells",function() { PFSheet.checkIsNewRow("lvl-6-spells");});
-on("remove:repeating_lvl-6-spells",function() { PFSheet.handleRepeatingRowOrdering("lvl-6-spells",true);});
-on("change:repeating_lvl-7-spells",function() { PFSheet.checkIsNewRow("lvl-7-spells");});
-on("remove:repeating_lvl-7-spells",function() { PFSheet.handleRepeatingRowOrdering("lvl-7-spells",true);});
-on("change:repeating_lvl-8-spells",function() { PFSheet.checkIsNewRow("lvl-8-spells");});
-on("remove:repeating_lvl-8-spells",function() { PFSheet.handleRepeatingRowOrdering("lvl-8-spells",true);});
-on("change:repeating_lvl-9-spells",function() { PFSheet.checkIsNewRow("lvl-9-spells");});
-on("remove:repeating_lvl-9-spells",function() { PFSheet.handleRepeatingRowOrdering("lvl-9-spells",true);});
-on("change:repeating_npc-spell-like-abilities",function() { PFSheet.checkIsNewRow("npc-spell-like-abilities");});
-on("remove:repeating_npc-spell-like-abilities",function() { PFSheet.handleRepeatingRowOrdering("npc-spell-like-abilities",true);});
-on("change:repeating_npc-spells1",function() { PFSheet.checkIsNewRow("npc-spells1");});
-on("remove:repeating_npc-spells1",function() { PFSheet.handleRepeatingRowOrdering("npc-spells1",true);});
-on("change:repeating_npc-spells2",function() { PFSheet.checkIsNewRow("npc-spells2");});
-on("remove:repeating_npc-spells2",function() { PFSheet.handleRepeatingRowOrdering("npc-spells2",true);});
-
-
 //Buffs - columns
 on("change:buff1_str change:buff2_str change:buff3_str change:buff4_str change:buff5_str change:buff6_str change:buff7_str change:buff8_str change:buff9_str change:buff10_str", function() { PFSheet.updateBuffColumn("STR"); });
 on("change:buff1_dex change:buff2_dex change:buff3_dex change:buff4_dex change:buff5_dex change:buff6_dex change:buff7_dex change:buff8_dex change:buff9_dex change:buff10_dex", function() { PFSheet.updateBuffColumn("DEX"); });
@@ -14176,13 +14214,21 @@ on("change:buff_check-total", function() {
     PFSheet.updateConditionCheckPenalty();
 });
 
-//Abilities and total buffs to them
-on("change:str-base change:str-enhance change:str-misc change:str-temp change:str-damage change:str-penalty change:str-drain change:buff_str-total change:str-cond", function() { PFSheet.updateAbility("STR"); });
-on("change:dex-base change:dex-enhance change:dex-misc change:dex-temp change:dex-damage change:dex-penalty change:dex-drain change:buff_dex-total change:dex-cond", function() { PFSheet.updateAbility("DEX"); });
-on("change:con-base change:con-enhance change:con-misc change:con-temp change:con-damage change:con-penalty change:con-drain change:buff_con-total change:con-cond", function() { PFSheet.updateAbility("CON"); });
-on("change:int-base change:int-enhance change:int-misc change:int-temp change:int-damage change:int-penalty change:int-drain change:buff_int-total change:int-cond", function() { PFSheet.updateAbility("INT"); });
-on("change:wis-base change:wis-enhance change:wis-misc change:wis-temp change:wis-damage change:wis-penalty change:wis-drain change:buff_wis-total change:wis-cond", function() { PFSheet.updateAbility("WIS"); });
-on("change:cha-base change:cha-enhance change:cha-misc change:cha-temp change:cha-damage change:cha-penalty change:cha-drain change:buff_cha-total change:cha-cond", function() { PFSheet.updateAbility("CHA"); });
+//Abilities 
+//on("change:str-base change:str-enhance change:str-misc change:str-temp change:str-damage change:str-penalty change:str-drain change:buff_str-total change:str-cond", function() { PFSheet.updateAbility("STR"); });
+//on("change:dex-base change:dex-enhance change:dex-misc change:dex-temp change:dex-damage change:dex-penalty change:dex-drain change:buff_dex-total change:dex-cond", function() { PFSheet.updateAbility("DEX"); });
+//on("change:con-base change:con-enhance change:con-misc change:con-temp change:con-damage change:con-penalty change:con-drain change:buff_con-total change:con-cond", function() { PFSheet.updateAbility("CON"); });
+//on("change:int-base change:int-enhance change:int-misc change:int-temp change:int-damage change:int-penalty change:int-drain change:buff_int-total change:int-cond", function() { PFSheet.updateAbility("INT"); });
+//on("change:wis-base change:wis-enhance change:wis-misc change:wis-temp change:wis-damage change:wis-penalty change:wis-drain change:buff_wis-total change:wis-cond", function() { PFSheet.updateAbility("WIS"); });
+//on("change:cha-base change:cha-enhance change:cha-misc change:cha-temp change:cha-damage change:cha-penalty change:cha-drain change:buff_cha-total change:cha-cond", function() { PFSheet.updateAbility("CHA"); });
+
+on("change:str-base change:str-enhance change:str-misc change:str-temp change:str-damage change:str-penalty change:str-drain", function() { PFSheet.updateAbility("STR"); });
+on("change:dex-base change:dex-enhance change:dex-misc change:dex-temp change:dex-damage change:dex-penalty change:dex-drain", function() { PFSheet.updateAbility("DEX"); });
+on("change:con-base change:con-enhance change:con-misc change:con-temp change:con-damage change:con-penalty change:con-drain change:con-cond", function() { PFSheet.updateAbility("CON"); });
+on("change:int-base change:int-enhance change:int-misc change:int-temp change:int-damage change:int-penalty change:int-drain change:int-cond", function() { PFSheet.updateAbility("INT"); });
+on("change:wis-base change:wis-enhance change:wis-misc change:wis-temp change:wis-damage change:wis-penalty change:wis-drain change:wis-cond", function() { PFSheet.updateAbility("WIS"); });
+on("change:cha-base change:cha-enhance change:cha-misc change:cha-temp change:cha-damage change:cha-penalty change:cha-drain change:cha-cond", function() { PFSheet.updateAbility("CHA"); });
+
 
 
 //Conditions
@@ -14249,20 +14295,28 @@ on("change:class-0-level change:class-1-level change:class-2-level change:class-
 
 //class abilities
 on("change:repeating_class-ability:max-calculation",function(){ SWUtils.evaluateAndSetNumber("repeating_class-ability_max-calculation","repeating_class-ability_used_max");});
+//on("change:repeating_class-ability:max-calculation",function(eventInfo){ console.log("Detected change to "+eventInfo.sourceAttribute);});
 
 //defense dropdowns
-on("change:ac-ability", function () {PFSheet.handleDropdown("AC-ability",["AC-ability-mod"]);});
-on("change:ff-ability", function () {PFSheet.handleDropdown("FF-ability",["FF-DEX"]);});
-on("change:cmd-ability1", function () {PFSheet.handleDropdown("CMD-ability1",["CMD-STR"]);});
-on("change:cmd-ability2", function () {PFSheet.handleDropdown("CMD-ability2",["CMD-DEX"]);});
-on("change:cmd-ability", function () {PFSheet.handleDropdown("CMD-ability",["FF-CMD-DEX"]);});
+//on("change:ac-ability", function () {PFSheet.handleDefenseDropdown("AC-ability");});
+//on("change:ff-ability", function () {PFSheet.handleDefenseDropdown("FF-ability");});
+//on("change:cmd-ability1", function () {PFSheet.handleDefenseDropdown("CMD-ability1");});
+//on("change:cmd-ability2", function () {PFSheet.handleDefenseDropdown("CMD-ability2");});
+//on("change:cmd-ability", function () {PFSheet.handleDefenseDropdown("CMD-ability");});
+
+on("change:ac-ability change:ff-ability change:cmd-ability1 change:cmd-ability2 change:cmd-ability"
+	, function (eventInfo) {PFSheet.handleDefenseDropdown(eventInfo.sourceAttribute);});
 
 
 //defenses
-on("change:condition-stunned change:condition-flat-footed change:ac-ability-mod change:ff-dex change:ac-penalty change:size change:ac-dodge change:ac-natural change:ac-deflect change:ac-misc change:ac-shield change:ac-armor change:cmd-dex change:ff-cmd-dex change:cmd-str change:cmd-misc change:buff_ac-total change:buff_touch-total change:buff_cmd-total change:bab change:max-dex",function() {
-    PFSheet.updateDefenses(); });
-on("change:shield-equipped change:shield-acbonus change:shield-max-dex change:shield-acp change:shield-spell-fail change:shield-proficiency change:shield2-equipped change:shield2-acbonus change:shield2-max-dex change:shield2-acp change:shield2-spell-fail change:shield2-proficiency change:armor-equipped change:armor-acbonus change:armor-max-dex change:armor-acp change:armor-spell-fail change:armor-proficiency change:armor2-equipped change:armor2-acbonus change:armor2-max-dex change:armor2-acp change:armor2-spell-fail change:armor2-proficiency change:max-dex-source change:acp-source",function(){
-    PFSheet.updateArmor(); });
+on("change:condition-stunned change:condition-flat-footed change:ac-ability-mod change:ff-dex change:ac-penalty change:size change:ac-dodge change:ac-natural change:ac-deflect change:ac-misc change:ac-shield change:ac-armor change:cmd-dex change:ff-cmd-dex change:cmd-str change:cmd-misc change:buff_ac-total change:buff_touch-total change:buff_cmd-total change:bab change:max-dex"
+	,function() { PFSheet.updateDefenses(); });
+on("change:shield-equipped change:shield-acbonus change:shield-max-dex change:shield-acp change:shield-spell-fail change:shield-proficiency "
+	+"change:shield2-equipped change:shield2-acbonus change:shield2-max-dex change:shield2-acp change:shield2-spell-fail change:shield2-proficiency "
+	+"change:armor-equipped change:armor-acbonus change:armor-max-dex change:armor-acp change:armor-spell-fail change:armor-proficiency "
+	+"change:armor2-equipped change:armor2-acbonus change:armor2-max-dex change:armor2-acp change:armor2-spell-fail change:armor2-proficiency "
+	+"change:max-dex-source change:acp-source"
+	,function(eventInfo){PFSheet.updateArmor(eventInfo.sourceAttribute); });
 
 //saves
 on("change:saves-cond change:total-fort change:fort-ability-mod change:fort-trait change:fort-enhance change:fort-resist change:fort-misc change:buff_fort-total",function(){
@@ -14274,48 +14328,47 @@ on("change:saves-cond change:total-ref change:ref-ability-mod change:ref-trait c
 on("change:saves-cond change:total-will change:will-ability-mod change:will-trait change:will-enhance change:will-resist change:will-misc change:buff_will-total",function(){
     PFSheet.updateSave("Will");
 });
-on("change:fort-ability", function(){PFSheet.handleDropdown  ("Fort-ability",["Fort-ability-mod"]);   });
-on("change:ref-ability", function(){PFSheet.handleDropdown  ("Ref-ability",["Ref-ability-mod"]);   });
-on("change:will-ability", function(){PFSheet.handleDropdown  ("Will-ability",["Will-ability-mod"]);   });
+on("change:fort-ability", function(){PFSheet.handleDropdown  ("Fort-ability","Fort-ability-mod");   });
+on("change:ref-ability", function(){PFSheet.handleDropdown  ("Ref-ability","Ref-ability-mod");   });
+on("change:will-ability", function(){PFSheet.handleDropdown  ("Will-ability","Will-ability-mod");   });
 
 
 //attacks
-on("change:melee-ability", function () {PFSheet.handleDropdown("melee-ability",["melee-ability-mod"]);});
-on("change:ranged-ability", function () {PFSheet.handleDropdown("ranged-ability",["ranged-ability-mod"]);});
-on("change:cmb-ability", function () {PFSheet.handleDropdown("CMB-ability",["CMB-ability-mod"]);});
+on("change:melee-ability", function () {PFSheet.handleDropdown("melee-ability","melee-ability-mod");});
+on("change:ranged-ability", function () {PFSheet.handleDropdown("ranged-ability","ranged-ability-mod");});
+on("change:cmb-ability", function () {PFSheet.handleDropdown("CMB-ability","CMB-ability-mod");});
 on("change:bab change:size change:melee-ability-mod change:buff_melee-total change:attk-melee-misc change:attk-penalty",function() { PFSheet.updateAttack("melee"); });
 on("change:bab change:size change:ranged-ability-mod change:buff_ranged-total change:attk-ranged-misc change:attk-penalty",function() { PFSheet.updateAttack("ranged"); });
 on("change:bab change:CMD-size change:cmb-ability-mod change:cmb-total change:attk-cmb-misc change:attk-penalty",function() { PFSheet.updateAttack("CMB"); });
-
 on("change:condition-Sickened change:buff_dmg-total",function(){PFSheet.updateDamage();});
 
 
 //attack effects
-on("change:attk-effect_mod_1 change:attk-effect_mod_1_Toggle change:attk-effect_mod_2 change:attk-effect_mod_2_Toggle change:attk-effect_mod_3 change:attk-effect_mod_3_Toggle change:attk-effect_mod_4 change:attk-effect_mod_4_Toggle",function(){
-    PFSheet.updateAttackEffectTotals();
+on("change:attk-effect_mod_1 change:attk-effect_mod_1_Toggle change:attk-effect_mod_2 change:attk-effect_mod_2_Toggle change:attk-effect_mod_3 change:attk-effect_mod_3_Toggle change:attk-effect_mod_4 change:attk-effect_mod_4_Toggle"
+,function(){ PFSheet.updateAttackEffectTotals();
 });
-on("change:dmg-effect_mod_1 change:dmg-effect_mod_1_Toggle change:dmg-effect_mod_2 change:dmg-effect_mod_2_Toggle change:dmg-effect_mod_3 change:dmg-effect_mod_3_Toggle change:dmg-effect_mod_4 change:dmg-effect_mod_4_Toggle",function(){
-    PFSheet.updateDMGEffectTotals();
+on("change:dmg-effect_mod_1 change:dmg-effect_mod_1_Toggle change:dmg-effect_mod_2 change:dmg-effect_mod_2_Toggle change:dmg-effect_mod_3 change:dmg-effect_mod_3_Toggle change:dmg-effect_mod_4 change:dmg-effect_mod_4_Toggle"
+,function(){ PFSheet.updateDMGEffectTotals();
 });
 //repeating weapons
-on("change:attk-effect-total",function(){PFSheet.updateRepeatingWeaponAttacks();});
+on("change:attk-effect-total",function(eventInfo){PFSheet.updateRepeatingWeaponAttacks(eventInfo);});
 on("change:dmg-effect-total change:dmg-mod", function(){PFSheet.updateRepeatingWeaponDamages();});
 
 
-on("change:repeating_weapon:masterwork change:repeating_weapon:proficiency change:repeating_weapon:attack-type-mod change:repeating_weapon:attack-mod",function() {
-    PFSheet.updateRepeatingWeaponAttack();
+on("change:repeating_weapon:attack-type-mod change:repeating_weapon:masterwork change:repeating_weapon:proficiency change:repeating_weapon:attack-mod"
+	, function(eventInfo) { PFSheet.updateRepeatingWeaponAttack(null,eventInfo);
 });
-on("change:repeating_weapon:damage-ability-mod change:repeating_weapon:damage-mod change:repeating_weapon:damage-ability-max",function() {
-    PFSheet.updateRepeatingWeaponDamage();
+on("change:repeating_weapon:damage-ability-mod change:repeating_weapon:damage-mod change:repeating_weapon:damage-ability-max"
+	,function() { PFSheet.updateRepeatingWeaponDamage();
 });
 
-on("change:repeating_weapon:attack-type",function() {PFSheet.handleRepeatingAttackDropdown();});
+on("change:repeating_weapon:attack-type",function(eventInfo) {PFSheet.handleRepeatingAttackDropdown(null,eventInfo);});
 on("change:repeating_weapon:damage-ability",function() {PFSheet.handleRepeatingDamageDropdown();});
 on("change:repeating_weapon:damage",function(){SWUtils.evaluateAndSetNumber("repeating_weapon_damage","repeating_weapon_damage-mod");});
 on("change:repeating_weapon:attack",function(){SWUtils.evaluateAndSetNumber("repeating_weapon_attack","repeating_weapon_attack-mod");});
 
-on("change:repeating_weapon:enhance",function() {
-	PFSheet.updateRepeatingWeaponAttack();
+on("change:repeating_weapon:enhance",function(eventInfo) {
+	PFSheet.updateRepeatingWeaponAttack(null,eventInfo);
 	PFSheet.updateRepeatingWeaponDamage();
 });
 
@@ -14373,4 +14426,12 @@ on("change:npc-hd change:npc-hd-num change:npc-hd2 change:npc-hd-num2 change:npc
 on("change:npc-hd-misc",function(){ SWUtils.evaluateAndSetNumber("NPC-HD-misc","NPC-HD-misc-mod");});
 
 
-</script>
\ No newline at end of file
+//set repeating IDS
+on("change:repeating_weapon:ids-show",function(eventInfo) {PFSheet.checkIsNewRow("weapon",eventInfo);});
+on("change:repeating_class-ability:ids-show",function(eventInfo) {PFSheet.checkIsNewRow("class-ability",eventInfo);});
+on("change:repeating_feat:ids-show",function(eventInfo) {PFSheet.checkIsNewRow("feat",eventInfo);});
+on("change:repeating_racial-trait:ids-show",function(eventInfo) {PFSheet.checkIsNewRow("racial-trait",eventInfo);});
+on("change:repeating_trait:ids-show",function(eventInfo) {PFSheet.checkIsNewRow("trait",eventInfo);});
+on("change:repeating_item:ids-show",function(eventInfo) {PFSheet.checkIsNewRow("item",eventInfo);});
+
+</script>