diff --git a/Pathfinder-Neceros/pathfinder-neceros.css b/Pathfinder-Neceros/pathfinder-neceros.css
index d4ca7fd298..68604e12c9 100644
--- a/Pathfinder-Neceros/pathfinder-neceros.css
+++ b/Pathfinder-Neceros/pathfinder-neceros.css
@@ -40,7 +40,13 @@
 .sheet-profession-bg-show:not(:checked)~.sheet-profession-bg,
 .sheet-misc-show:not(:checked)~.sheet-misc,
 .sheet-misc-adv-show:not(:checked)~.sheet-misc-adv,
-.sheet-misc-bg-show:not(:checked)~.sheet-misc-bg {
+.sheet-misc-bg-show:not(:checked)~.sheet-misc-bg,
+.sheet-bg_allskills-show:not(:checked) ~ .sheet-artistry,
+.sheet-bg_allskills-show:not(:checked) ~ .sheet-artistry-show, 
+.sheet-bg_allskills-show:not(:checked) ~ .sheet-artistry-show + span::before,
+.sheet-bg_allskills-show:not(:checked) ~ .sheet-lore,
+.sheet-bg_allskills-show:not(:checked) ~ .sheet-lore-show,
+.sheet-bg_allskills-show:not(:checked) ~ .sheet-lore-show + span::before {
 	display:none !important;
 }
 .sheet-expand-show:checked ~div .sheet-sect-show:checked ~.sheet-expand { 
@@ -727,11 +733,11 @@ input.sheet-counted {
 	top:15px;
 }
 input.sheet-counted + span {
-	width:3.5%;
+	width:.5%;
 	min-width:2em;
 }
 span.sheet-repeating-rollbutton {
-	width:4%;
+	width:.5%;
 }
 input[type="checkbox"].sheet-split-column-show:checked input.sheet-counted {
 	width:5.5%;
diff --git a/Pathfinder-Neceros/pathfinder-neceros.html b/Pathfinder-Neceros/pathfinder-neceros.html
index 28dc13c8dd..47c921c2bd 100644
--- a/Pathfinder-Neceros/pathfinder-neceros.html
+++ b/Pathfinder-Neceros/pathfinder-neceros.html
@@ -449,17 +449,17 @@
         <input type="checkbox" class="sheet-sect-show" title="@{health-and-wounds-show}" name="attr_health-and-wounds-show" value="1" style="width:140px; margin:0 -15px 0 -125px;" checked="checked" /><span></span>
 		<div class="sheet-table sheet-sect">
 			<span class="sheet-table-name">Health and Wounds</span>
-			<div class="sheet-table-row">
+					<div class="sheet-table-row">	
                 <span class="sheet-table-header" title="Player adjustable hit points that reflects the character&#146;s current hit points remaining.">Current HP</span>
-				<span class="sheet-table-header">/</span>
+					<span class="sheet-table-header">/</span>
                 <span class="sheet-table-header" title="Automatically calculated using Class hit points, Favored Class hit points (see Classes tab), Ability bonus/penalty & Level, HP Adj1, Mod2, Drained condition and Mythic Adventures hit points (if enabled).">Max HP</span>
-				<span class="sheet-table-header">&nbsp;</span>
-                <span class="sheet-table-header" title="The Ability Score that contributes a bonus/penalty to the overall character hit points by level.">Ability</span>
-                <span class="sheet-table-header" title="The modifier that comes from the Ability Score chosen to adjust hit points per level.">Mod</span>
-				<span class="sheet-table-header">&nbsp;</span>
-                <span class="sheet-table-header" title="Player configurable flat adjustment to maximum hit points.">HP adj1</span>
-                <span class="sheet-table-header" title="Player configurable adjustment to maximum hit points by way of a formula.">HP adj2</span>
-                <span class="sheet-table-header" title="The value produced by the HP adj2 formula.">Mod2</span>
+					<span class="sheet-table-header">&nbsp;</span>
+					<span class="sheet-table-header" title="The Ability Score that contributes a bonus/penalty to the overall character hit points by level.">Ability</span>
+					<span class="sheet-table-header" title="The modifier that comes from the Ability Score chosen to adjust hit points per level.">Mod</span>
+					<span class="sheet-table-header">&nbsp;</span>
+					<span class="sheet-table-header" title="Player configurable flat adjustment to maximum hit points.">HP adj1</span>
+					<span class="sheet-table-header" title="Player configurable adjustment to maximum hit points by way of a formula.">HP adj2</span>
+					<span class="sheet-table-header" title="The value produced by the HP adj2 formula.">Mod2</span>
 				<span class="sheet-table-header">&nbsp;</span>
                 <span class="sheet-table-header" title="Temporary hit points that are manually deducted from the character and are not otherwise reflected elsewhere on the character sheet.">Temp HP</span>
 				<span class="sheet-table-header">&nbsp;</span>
@@ -468,25 +468,25 @@
                 <span class="sheet-table-header" title="Temporary hit points that come from active Buffs (see Core tab).">Buffs</span>
 				<span class="sheet-table-header">&nbsp;</span>
                 <span class="sheet-table-header" title="Player adjustable tracking of non-lethal damage.">Nonlethal Dmg</span>
-			</div>
+				</div>
 			<div class="sheet-table-row" style="line-height:.1em;">
                 <span class="sheet-table-data sheet-center"><input type="number" style="width:100%;" title="@{HP}" name="attr_HP" value="0" /></span>
-				<span class="sheet-table-data sheet-divider">/</span>
+					<span class="sheet-table-data sheet-divider">/</span>
 				<span class="sheet-table-data sheet-center"><input type="number" style="width:100%;" title="@{HP|max}" name="attr_HP_max" value="0"  class="sheet-calc" readonly="readonly" /></span>
-				<span class="sheet-table-data sheet-divider">=</span>
+					<span class="sheet-table-data sheet-divider">=</span>
 				<span class="sheet-table-data sheet-center" style="width:65px;">
 					<select style="width:100%;" title="@{HP-ability}" name="attr_HP-ability" class="sheet-select-small">
-						<option value="0" >None</option>
-						<option value="@{STR-mod}">STR</option>
-						<option value="@{DEX-mod}">DEX</option>
+							<option value="0">None</option>
+							<option value="@{STR-mod}">STR</option>
+							<option value="@{DEX-mod}">DEX</option>
 						<option value="@{CON-mod}" selected>&#8226;CON</option>
-						<option value="@{INT-mod}">INT</option>
-						<option value="@{WIS-mod}">WIS</option>
-						<option value="@{CHA-mod}">CHA</option>
-					</select>
-				</span>
+							<option value="@{INT-mod}">INT</option>
+							<option value="@{WIS-mod}">WIS</option>
+							<option value="@{CHA-mod}">CHA</option>
+						</select>
+					</span>
 				<span class="sheet-table-data sheet-center"><input type="number" style="width:100%;" title="@{HP-ability-mod}" name="attr_HP-ability-mod" value="0" class="sheet-calc" readonly="readonly" /></span>
-				<span class="sheet-table-data sheet-divider">+</span>
+					<span class="sheet-table-data sheet-divider">+</span>
 				<span class="sheet-table-data sheet-center"><input type="number" style="width:100%;" title="@{HP-misc}" name="attr_HP-misc" value="0" /></span>
 				<span class="sheet-table-data sheet-center"><input type="text" style="width:100%;" title="@{HP-formula-macro-text}" name="attr_HP-formula-macro-text" value="" Placeholder="macro" /></span>
 				<span class="sheet-table-data sheet-center"><input type="number" style="width:100%;" title="@{HP-formula-mod}" name="attr_HP-formula-mod" value="0" class="sheet-calc" readonly="readonly" /></span>
@@ -498,8 +498,8 @@
 				<span class="sheet-table-data sheet-center"><input type="number" style="width:100%;" title="@{buff_HP-temp-total}" name="attr_buff_HP-temp-total" value="0" class="sheet-calc" readonly="readonly" /></span>
 				<span class="sheet-table-data sheet-center">&nbsp;|&nbsp;</span>
 				<span class="sheet-table-data sheet-center"><input type="number" style="width:100%;" title="@{non-lethal-damage}" name="attr_non-lethal-damage" value="0" min="0"></span>
+				</div>
 			</div>
-		</div>
         <div class="sheet-table sheet-sect" style="margin:-10px 0 -10px 0;">
             <input type="checkbox" class="sheet-sect-show" title="@{wound_threshold-show}" name="attr_wound_threshold-show" value="1" style="width:35px; margin:-9999px;" /><span></span>
 			<div class="sheet-table-row sheet-sect">
@@ -568,6 +568,8 @@
 							<span class="sheet-table-header">Swim</span>
 							<span class="sheet-table-header">Climb</span>
 							<span class="sheet-table-header">Misc</span>
+							<span class="sheet-table-header sheet-divider-lg"></span>
+							<span class="sheet-table-header" title="Run Multiplier" >Mult</span>
                             <span class="sheet-table-header" title="The maximum distance that the character can run in a straight line during your turn">Run</span>
 						</div>
 						<div class="sheet-table-row">
@@ -577,6 +579,8 @@
 							<span class="sheet-table-data sheet-center"><input style="width:100%;" title="@{speed-swim}" type="number" name="attr_speed-swim" value="0" step="5" /></span>
 							<span class="sheet-table-data sheet-center"><input style="width:100%;" title="@{speed-climb}" type="number" name="attr_speed-climb" value="0" step="5" /></span>
 							<span class="sheet-table-data sheet-center"><input style="width:100%;" title="@{speed-misc}" type="number" name="attr_speed-misc" value="0" step="5" /></span>
+							<span class="sheet-table-data sheet-divider-lg">|</span>
+							<span class="sheet-table-data sheet-center"><input style="width:100%;" title="@{speed-run-mult}" type="number" name="attr_run-mult" value="4" step="1" /></span>
                             <span class="sheet-table-data sheet-center"><input style="width:100%;" title="@{speed-run}" type="number" name="attr_speed-run" value="0" class="sheet-calc" readonly="readonly" /></span>
                         </div>
 						</div>
@@ -590,8 +594,13 @@
                 </span>
                 <span class="sheet-table-data sheet-center">&nbsp;</span>
                 <span class="sheet-table-data sheet-center">
-                    <textarea class="sheet-speed-notes" name="attr_speed-notes" title="@{speed-notes}" placeholder="Speed Notes"></textarea>
-                    <label class="sheet-center sheet-small-label"><b>Speed Notes</b></label>
+					<label class="sheet-center sheet-small-label" style="display:inline; float:left;width:auto;margin-top:.35em;"><b>Encumbrance:</b></label>
+					<select title="@{speed-source}" name="attr_speed-source" style="width:auto;display:inline;float:left;" >
+                        <option value="0" selected>&#8226;Armor, Shield &amp; Load</option>
+                        <option value="1">Armor &amp; Shield only</option>
+                        <option value="2">Load only</option>
+                        <option value="3">None</option>
+					</select>
                 </span>
 			</div>
 
@@ -603,7 +612,10 @@
 					<label class="sheet-center sheet-small-label"><input type="checkbox" title="@{toggle_init_notes}" name="attr_toggle_init_notes" value="@{var_init_notes}" /><b title="Include initiative notes with roll."> Initiative Notes</b></label>
 				</span>
                 <span class="sheet-table-data sheet-center">&nbsp;</span>
-                <span class="sheet-table-data sheet-center">&nbsp;</span>
+                <span class="sheet-table-data sheet-center">
+                    <textarea class="sheet-speed-notes" name="attr_speed-notes" title="@{speed-notes}" placeholder="Speed Notes"></textarea>
+                    <label class="sheet-center sheet-small-label"><b>Speed Notes</b></label>
+				</span>
 			</div>
 		</div>
 		<br>
@@ -900,15 +912,15 @@
         <input type="checkbox" class="sheet-sect sheet-split-column-show" value="1" name="attr_class-ability-column-show" title="Two or one column rows" /><span class="sheet-sect"></span>
 		<div class="sheet-table sheet-sect">
 			<span class="sheet-table-name">Class Features and Abilities</span>	
-			</div>
+		</div>
 		<div class="sheet-table sheet-sect">
 			<div class="sheet-repeating-fields">
 				<fieldset class="repeating_class-ability">
                     <div class="sheet-compendium-drop-target">
                         <input type="checkbox" class="sheet-counted sheet-sect-show" name="attr_class-show" title="@{repeating_class-ability_$X_class-show}" value="1" checked="checked" />
-                        <span class="sheet-table-data sheet-center"></span>
-                        <span class="sheet-table-data sheet-center sheet-repeating-rollbutton"><button type="roll" name="attr_roll" title="%{selected|repeating_class-ability_$X_roll}" value="@{macro-text}"></button></span>
-                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:8%">
+                        <span class="sheet-table-data sheet-center"></span>						
+						<span class="sheet-table-data sheet-center sheet-repeating-rollbutton"><button type="roll" name="attr_roll" title="%{selected|repeating_class-ability_$X_roll}" value="@{macro-text}"></button></span>
+						<span class="sheet-table-data sheet-center sheet-small-label sheet-sect">
 							<select title="@{repeating_class-ability_$X_class-number}" name="attr_class-number" style="min-width:3.5em;">
 								<option value="@{class-0-name}" selected>0</option>
 								<option value="@{class-1-name}">1</option>
@@ -917,15 +929,15 @@
 								<option value="@{class-4-name}">4</option>
 								<option value="@{class-5-name}">5</option>
 							</select>
-                            <br>Class #
+							<br>Class #
 						</span>
-                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:8%;"><input title="@{repeating_class-ability_$X_class-name}" type="text" name="attr_class-name" value="@{class-number}" disabled />Class<br></span>
-                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input title="@{repeating_class-ability_$X_name}" type="text" name="attr_name" placeholder="Ability Name" accept="Name"><br>Name</span>
-                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:32%;"><input title="@{repeating_class-ability_$X_short-description}" type="text" name="attr_short-description" placeholder="Short Description"><br>Short Desc</span>
-                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_class-ability_$X_used}" type="number" name="attr_used" value="0" /><br>Uses</span>
-						<span class="sheet-table-data sheet-divider-lg">/</span>
-                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_class-ability_$X_used|max}" type="number" name="attr_used_max" value="0" class="sheet-calc" readonly="readonly" /><br>Max</span>
-                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><input title="@{repeating_class-ability_$X_max-calculation}" type="text" name="attr_max-calculation" value="" Placeholder="macro" /><br>Max Calc</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:13%"><input title="@{repeating_class-ability_$X_class-name}" type="text" name="attr_class-name" value="@{class-number}" disabled />Class<br></span>
+						<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_class-ability_$X_name}" type="text" name="attr_name" placeholder="Ability Name" accept="Name"><br>Name</span>
+						<span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:30%;"><input title="@{repeating_class-ability_$X_short-description}" type="text" name="attr_short-description" placeholder="Short Description"><br>Short Desc</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:0.1%;"><input title="@{repeating_class-ability_$X_used}" type="number" name="attr_used" value="0" /><br>Uses</span>
+						<span class="sheet-table-data sheet-divider-lg" style="width:0.1%;">/</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:0.1%;"><input title="@{repeating_class-ability_$X_used|max}" type="number" name="attr_used_max" value="0" class="sheet-calc" readonly="readonly" /><br>Max</span>
+						<span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:15%;"><input title="@{repeating_class-ability_$X_max-calculation}" type="text" name="attr_max-calculation" value="" Placeholder="macro" /><br>Max Calc</span>
 						<div class="sheet-sect sheet-expand">					
 							<b>Description</b>
 							<input type="checkbox" class="sheet-desc-show" title="@{repeating_class-ability_$X_description-show}" name="attr_description-show" value="1" style="opacity:0; width:90px; height:1.5em; position:relative; top:0; left:0; margin:0 -15px 0 -75px; cursor:pointer; z-index:1;" checked="checked" /><span></span>
@@ -959,7 +971,7 @@
                 <input type="checkbox" class="sheet-sect sheet-split-column-show" value="1" name="attr_mythic-column-show" title="Two or one column rows" /><span class="sheet-sect"></span>
                 <div class="sheet-table sheet-sect">
                     <span class="sheet-table-name">Mythic Path Features and Abilities</span>
-                    </div>
+                </div>
                 <div class="sheet-table sheet-sect">
                     <div class="sheet-repeating-fields">
                         <fieldset class="repeating_mythic-ability">
@@ -967,44 +979,44 @@
                                 <input type="checkbox" class="sheet-counted sheet-sect-show" name="attr_mythic-show" title="@{repeating_mythic-ability_$X_mythic-show}" value="1" checked="checked" />
                                 <span class="sheet-table-data sheet-center"></span>
                                 <span class="sheet-table-data sheet-center sheet-repeating-rollbutton"><button type="roll" name="attr_roll" title="%{selected|repeating_mythic-ability_$X_roll}" value="@{macro-text}"></button></span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:8%">
-								<select title="@{repeating_mythic-ability_$X_mythic-number}" name="attr_mythic-number" style="min-width:3.5em;">
-									<option value="@{mythic-0-path}" selected>0</option>
-									<option value="@{mythic-1-path}">1</option>
-								</select>
+                                <span class="sheet-table-data sheet-center sheet-small-label sheet-sect">
+									<select title="@{repeating_mythic-ability_$X_mythic-number}" name="attr_mythic-number" style="min-width:3.5em;">
+										<option value="@{mythic-0-path}" selected>0</option>
+										<option value="@{mythic-1-path}">1</option>
+									</select>
                                     <br>Path #
-							</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:8%;"><input title="@{repeating_mythic-ability_$X_mythic-path}" type="text" name="attr_mythic-path" value="@{mythic-number}" disabled /><br>Path</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input title="@{repeating_mythic-ability_$X_name}" type="text" name="attr_name" placeholder="Mythic Feature/Ability Name" accept="Name"><br>Name</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:32%;"><input title="@{repeating_mythic-ability_$X_short-description}" type="text" name="attr_short-description" placeholder="Short Description"><br>Short Desc</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_mythic-ability_$X_used}" type="number" name="attr_used" value="0" /><br>Uses</span>
-							<span class="sheet-table-data sheet-divider-lg">/</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_mythic-ability_$X_used|max}" type="number" name="attr_used_max" value="0" class="sheet-calc" readonly="readonly" /><br>Max</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><input title="@{repeating_mythic-ability_$X_max-calculation}" type="text" name="attr_max-calculation" value="" Placeholder="macro" /><br>Max Calc</span>
-                            <div class="sheet-sect sheet-expand">
-                                <b>Description</b>
-                                <input type="checkbox" class="sheet-desc-show" title="@{repeating_mythic-ability_$X_description-show}" name="attr_description-show" value="1" style="opacity:0; width:90px; height:1.5em; position:relative; top:0; left:0; margin:0 -15px 0 -75px; cursor:pointer; z-index:1;" checked="checked" /><span></span>
-                                <b>Macro Text</b>
-                                <input type="checkbox" class="sheet-macro-text-show" title="@{repeating_mythic-ability_$X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0; width:90px; height:1.5em; position:relative; top:0; left:0; margin:0 -15px 0 -75px; cursor:pointer; z-index:1;" /><span></span>
-                                <b>IDs</b>
-                                <input type="checkbox" class="sheet-repeating_ids-show" title="@{repeating_mythic-ability_$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>
-								<textarea class="sheet-desc" title="@{repeating_mythic-ability_$X_description}" name="attr_description" accept="Content"></textarea>
-                                <textarea class="sheet-macro-text" title="@{repeating_mythic-ability_$X_macro-text}" name="attr_macro-text">@{PC-whisper} &{template:pf_block} {{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_block}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{Class=**Path**: @{mythic-number}}} {{name=@{name}}} {{description=@{short-description}}}</textarea>
-							<div class="sheet-repeating_ids sheet-table-row">
-								<input type="hidden" name="attr_new_flag" value="0" />
-								<span class="sheet-table-data sheet-small-data">
-								<input type="text" name="attr_row_id" value="" class="sheet-calc" style="width:15em;" readonly="readonly" />
-								<button class="sheet-blank-roll-button" style="font-size: 85%;" type="roll" name="attr_row_id_roll" value="/w @{character_name} &{template:pf_generic} {{Row id=@{row_id}}}" > Post ID</button>
 								</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:13%;"><input title="@{repeating_mythic-ability_$X_mythic-path}" type="text" name="attr_mythic-path" value="@{mythic-number}" disabled /><br>Path</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_mythic-ability_$X_name}" type="text" name="attr_name" placeholder="Mythic Feature/Ability Name" accept="Name"><br>Name</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:30%;"><input title="@{repeating_mythic-ability_$X_short-description}" type="text" name="attr_short-description" placeholder="Short Description"><br>Short Desc</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:.1%;"><input title="@{repeating_mythic-ability_$X_used}" type="number" name="attr_used" value="0" /><br>Uses</span>
+								<span class="sheet-table-data sheet-divider-lg" style="width:.1%;">/</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:.1%;"><input title="@{repeating_mythic-ability_$X_used|max}" type="number" name="attr_used_max" value="0" class="sheet-calc" readonly="readonly" /><br>Max</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:15%;"><input title="@{repeating_mythic-ability_$X_max-calculation}" type="text" name="attr_max-calculation" value="" Placeholder="macro" /><br>Max Calc</span>
+								<div class="sheet-sect sheet-expand">
+									<b>Description</b>
+									<input type="checkbox" class="sheet-desc-show" title="@{repeating_mythic-ability_$X_description-show}" name="attr_description-show" value="1" style="opacity:0; width:90px; height:1.5em; position:relative; top:0; left:0; margin:0 -15px 0 -75px; cursor:pointer; z-index:1;" checked="checked" /><span></span>
+									<b>Macro Text</b>
+									<input type="checkbox" class="sheet-macro-text-show" title="@{repeating_mythic-ability_$X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0; width:90px; height:1.5em; position:relative; top:0; left:0; margin:0 -15px 0 -75px; cursor:pointer; z-index:1;" /><span></span>
+									<b>IDs</b>
+									<input type="checkbox" class="sheet-repeating_ids-show" title="@{repeating_mythic-ability_$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>
+									<textarea class="sheet-desc" title="@{repeating_mythic-ability_$X_description}" name="attr_description" accept="Content"></textarea>
+									<textarea class="sheet-macro-text" title="@{repeating_mythic-ability_$X_macro-text}" name="attr_macro-text">@{PC-whisper} &{template:pf_block} {{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_block}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{Class=**Path**: @{mythic-number}}} {{name=@{name}}} {{description=@{short-description}}}</textarea>
+									<div class="sheet-repeating_ids sheet-table-row">
+										<input type="hidden" name="attr_new_flag" value="0" />
+										<span class="sheet-table-data sheet-small-data">
+											<input type="text" name="attr_row_id" value="" class="sheet-calc" style="width:15em;" readonly="readonly" />
+											<button class="sheet-blank-roll-button" style="font-size: 85%;" type="roll" name="attr_row_id_roll" value="/w @{character_name} &{template:pf_generic} {{Row id=@{row_id}}}" > Post ID</button>
+										</span>
+									</div>
+								</div>
 							</div>
-						</div>
+						</fieldset>
 					</div>
-				</fieldset>
+				</div>
 			</div>
-		</div>
-	</div>
         </div>
-</div>
+	</div>
 </div>
 <div class="sheet-section sheet-section-defenses">
 	<div class="sheet-table sheet-header-row">&nbsp;</div>
@@ -1976,12 +1988,12 @@
                     <input type="checkbox" class="sheet-counted sheet-sect-show" name="attr_attack-show" title="@{repeating_weapon_$X_attack-show}" value="1" checked="checked" />
                     <span class="sheet-table-data sheet-center"></span>
                     <span class="sheet-table-data sheet-center sheet-repeating-rollbutton"><button type="roll" name="attr_attack-roll" title="%{selected|repeating_weapon_$X_attack-roll}" value="@{macro-text}"></button></span>
-					<span class="sheet-table-data sheet-center sheet-small-label"><input type="number"  name="attr_enhance" title="@{repeating_weapon_$X_enhance}" value="0" style="width:40px;"  /><br>Enh</span>
-					<span class="sheet-table-data sheet-center sheet-small-label" style="padding-top: 8px;"><input type="checkbox" name="attr_masterwork" title="@{repeating_weapon_$X_masterwork}" value="1" style="width:15px;height:15px;" /><br>Mwk</span>
+					<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input type="number"  name="attr_enhance" title="@{repeating_weapon_$X_enhance}" value="0" style="width:40px;"  /><br>Enh</span>
+					<span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="padding-top: 8px;"><input type="checkbox" name="attr_masterwork" title="@{repeating_weapon_$X_masterwork}" value="1" style="width:15px;height:15px;" /><br>Mwk</span>
 					<span class="sheet-table-data sheet-center sheet-small-label"><input type="text" name="attr_name" title="@{repeating_weapon_$X_name}" placeholder="Name" /><br>Name</span>
-					<span class="sheet-table-data sheet-center sheet-small-label" style="width:8%;"><input type="text" name="attr_attack" title="@{repeating_weapon_$X_attack}" placeholder="Attack Modifiers" /><br>ATK&nbsp;Mods</span>
-					<span class="sheet-table-data sheet-center sheet-small-label" style="width:8%;"><input type="number" name="attr_attack-mod" title="@{repeating_weapon_$X_attack-mod}" value="0" style="width:40px;" class="sheet-calc" readonly="readonly" /><br>val</span>
-					<span class="sheet-table-data sheet-divider">+</span>
+					<span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:8%;"><input type="text" name="attr_attack" title="@{repeating_weapon_$X_attack}" placeholder="Attack Modifiers" /><br>ATK&nbsp;Mods</span>
+					<span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:8%;"><input type="number" name="attr_attack-mod" title="@{repeating_weapon_$X_attack-mod}" value="0" style="width:40px;" class="sheet-calc" readonly="readonly" /><br>val</span>
+					<span class="sheet-table-data sheet-divider sheet-sect">+</span>
 					<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;">
 						<select title="@{repeating_weapon_$X_attack-type}" name="attr_attack-type">
 							<option value="0" selected>&#8226;None</option>
@@ -1991,84 +2003,79 @@
 						</select>
 						<br>ATK Type
 					</span>
-					<span class="sheet-table-data sheet-center sheet-small-label"><input type="number" name="attr_attack-type-mod" title="@{repeating_weapon_$X_attack-type-mod}" value="0" style="width:40px;" class="sheet-calc" readonly="readonly" /><br>mod</span>
+					<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input type="number" name="attr_attack-type-mod" title="@{repeating_weapon_$X_attack-type-mod}" value="0" style="width:40px;" class="sheet-calc" readonly="readonly" /><br>mod</span>
 					<span class="sheet-table-data sheet-divider">+</span>
-					<span class="sheet-table-data sheet-center sheet-small-label"><input type="number" name="attr_attk-effect-total-copy" title="@{repeating_weapon_$X_attk-effect-total-copy}" value="0" style="width:40px;" class="sheet-calc" readonly="readonly"  /><br><b title="Additional modifier from Attack and Damage Effects.">Other</b></span>
-					<span class="sheet-table-data sheet-divider">=</span>
+					<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input type="number" name="attr_attk-effect-total-copy" title="@{repeating_weapon_$X_attk-effect-total-copy}" value="0" style="width:40px;" class="sheet-calc" readonly="readonly"  /><br><b title="Additional modifier from Attack and Damage Effects.">Other</b></span>
+					<span class="sheet-table-data sheet-divider sheet-sect">=</span>
 					<span class="sheet-table-data sheet-center sheet-small-label"><input type="number" name="attr_total-attack" title="@{repeating_weapon_$X_total-attack}" value="0" style="width:3.5em;" class="sheet-calc" readonly="readonly" /><br>ATK</span>
                     <span class="sheet-table-data sheet-center sheet-small-label"><input type="number" name="attr_crit-target" title="@{repeating_weapon_$X_crit-target}" style="width:40px;" value="20" min="0" max="20" /><br>Crit</span>
 					<span class="sheet-table-data sheet-divider-lg" style="padding-bottom:10px;"><b>/x</b></span>
 					<span class="sheet-table-data sheet-center sheet-small-label"><input type="number" name="attr_crit-multiplier" title="@{repeating_weapon_$X_crit-multiplier}" style="width:40px;" value="2" min="0" /><br>Mult</span>
-					<span class="sheet-table-data sheet-center sheet-small-label">
+					<span class="sheet-table-data sheet-center sheet-small-label sheet-sect">
 						<select title="@{repeating_weapon_$X_proficiency}" name="attr_proficiency">
 							<option value="0" selected>&#8226;Yes</option>
 							<option value="-4">No</option>
 						</select>
 						<br>Proficiency
 					</span>
-					<div class="sheet-sect sheet-expand">
-						<div class="sheet-table">
-							<div class="sheet-table-row">
-								<span class="sheet-table-data sheet-center sheet-small-label" ><input type="number" name="attr_damage-dice-num" title="@{repeating_weapon_$X_damage-dice-num}"  style="width:2.8em;" value="0" min="0" /><br>Dice</span>
-								<span class="sheet-table-data sheet-divider" style="padding-bottom: 10px;">d</span>
-								<span class="sheet-table-data sheet-center sheet-small-label" style="width:3em;" ><input type="number" name="attr_damage-die" title="@{repeating_weapon_$X_damage-die}" style="width:2.8em;" value="0" min="0" /><br>Die</span>
-								<span class="sheet-table-data sheet-divider">+</span>
-								<span class="sheet-table-data sheet-center sheet-small-label sheet-entry_med" ><input type="text" name="attr_damage" title="@{repeating_weapon_$X_damage}" placeholder="Damage Modifiers" /><br>DMG Mods</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"  ><input type="number" name="attr_damage-mod" title="@{repeating_weapon_$X_damage-mod}" value="0" style="width:2.4em;" class="sheet-calc" readonly="readonly" /><br>val</span>
-								<span class="sheet-table-data sheet-divider">+</span>
-								<span class="sheet-table-data sheet-center sheet-small-label" style="width:8%;">
-									<select title="@{repeating_weapon_$X_damage-ability}" name="attr_damage-ability" style="font-size:1em;">
-										<option value="0 - [[ @{condition-sickened} ]]" selected>&#8226;None</option>
-										<option value="floor(0.5 * @{STR-mod}) - [[ @{condition-sickened} ]]">1/2 STR</option>
-										<option value="floor(0.5 * @{DEX-mod}) - [[ @{condition-sickened} ]]">1/2 DEX</option>
-										<option value="floor(0.5 * @{CON-mod}) - [[ @{condition-sickened} ]]">1/2 CON</option>
-										<option value="floor(0.5 * @{INT-mod}) - [[ @{condition-sickened} ]]">1/2 INT</option>
-										<option value="floor(0.5 * @{WIS-mod}) - [[ @{condition-sickened} ]]">1/2 WIS</option>
-										<option value="floor(0.5 * @{CHA-mod}) - [[ @{condition-sickened} ]]">1/2 CHA</option>
-										<option value="@{STR-mod} - [[ @{condition-sickened} ]]" >STR</option>
-										<option value="@{DEX-mod} - [[ @{condition-sickened} ]]">DEX</option>
-										<option value="@{CON-mod} - [[ @{condition-sickened} ]]">CON</option>
-										<option value="@{INT-mod} - [[ @{condition-sickened} ]]">INT</option>
-										<option value="@{WIS-mod} - [[ @{condition-sickened} ]]">WIS</option>
-										<option value="@{CHA-mod} - [[ @{condition-sickened} ]]">CHA</option>
-										<option value="floor(1.5 * @{STR-mod}) - [[ @{condition-sickened} ]]">1.5x STR</option>
-										<option value="floor(1.5 * @{DEX-mod}) - [[ @{condition-sickened} ]]">1.5x DEX</option>
-										<option value="floor(1.5 * @{CON-mod}) - [[ @{condition-sickened} ]]">1.5x CON</option>
-										<option value="floor(1.5 * @{INT-mod}) - [[ @{condition-sickened} ]]">1.5x INT</option>
-										<option value="floor(1.5 * @{WIS-mod}) - [[ @{condition-sickened} ]]">1.5x WIS</option>
-										<option value="floor(1.5 * @{CHA-mod}) - [[ @{condition-sickened} ]]">1.5x CHA</option>
-										<option value="floor(2 * @{STR-mod}) - [[ @{condition-sickened} ]]">2x STR</option>
-										<option value="floor(2 * @{DEX-mod}) - [[ @{condition-sickened} ]]">2x DEX</option>
-										<option value="floor(2 * @{CON-mod}) - [[ @{condition-sickened} ]]">2x CON</option>
-										<option value="floor(2 * @{INT-mod}) - [[ @{condition-sickened} ]]">2x INT</option>
-										<option value="floor(2 * @{WIS-mod}) - [[ @{condition-sickened} ]]">2x WIS</option>
-										<option value="floor(2 * @{CHA-mod}) - [[ @{condition-sickened} ]]">2x CHA</option>
-									</select>
-									<br>DMG Ability
-								</span>
-								<span class="sheet-table-data sheet-center sheet-small-label" style="width:2em;" ><input style="width:2em;" type="text" name="attr_damage-ability-max" title="@{repeating_weapon_$X_damage-ability-max} for strength bows, etc." value="" Placeholder="NA" /><br/>Max</span>
-								<span class="sheet-table-data sheet-center sheet-small-label" ><input type="number" name="attr_damage-ability-mod" title="@{repeating_weapon_$X_attr_damage-ability-mod}" value="0" style="width:2.4em;" class="sheet-calc" readonly="readonly" /><br/>Mod</span>
-								<span class="sheet-table-data sheet-divider">+</span>
-								<span class="sheet-table-data sheet-center"><span class="sheet-table-data sheet-center sheet-small-label" ><input type="number" name="attr_dmg-effect-total-copy" title="@{repeating_weapon_$X_dmg-effect-total-copy}" value="0" style="width:2.8em;" class="sheet-calc" readonly="readonly"  /><br><b title="Additional modifier from Attack and Damage Effects.">Other</b></span></span>
-								<span class="sheet-table-data sheet-divider">+</span>
-								<span class="sheet-table-data sheet-center"><span class="sheet-table-data sheet-center sheet-small-label" ><input type="number" name="attr_DMG-mod-copy" title="@{DMG-mod} buffs and conditions" value="0" style="width:2.8em;" class="sheet-calc" readonly="readonly" /><br>Adj</span></span>
-								<span class="sheet-table-data sheet-divider">=</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input type="number" name="attr_total-damage" title="@{repeating_weapon_$X_total-damage}" value="0" style="width:2.8em;" class="sheet-calc" readonly="readonly" /><br>DMG</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input type="number" name="attr_range" title="@{repeating_weapon_$X_range}" value="0"  min="0" style="width:3.5em;"  /><br>Range</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input type="text" name="attr_type" title="@{repeating_weapon_$X_type} Damage Type" placeholder="Damage Type" style="width:3em;"/><br>type</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input type="number" name="attr_weight" title="@{repeating_weapon_$X_weight}" value="0"  step="any" min="0" style="width:3em;" /><br>WT</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input type="number" name="attr_ammo" title="@{repeating_weapon_$X_ammo}" value="0" style="width:2.8em;"  /><br>Ammo</span>
-							</div>
-						</div>
-						<div class="sheet-table">
-							<div class="sheet-table-row">
-								<textarea class="sheet-weapon-notes" name="attr_notes" title="@{repeating_weapon_$X_notes}" placeholder="Weapon Notes"></textarea>
-								<span class="sheet-center sheet-small-label" style="display: block;">Notes</span>
-								<span class="sheet-table-data sheet-center sheet-small-label" style="width:5em;"><input type="number" name="attr_weapon-hardness" title="@{repeating_weapon_$X_weapon-hardness}" value="0"  step="any" min="0" style="width:3em;" /><br>Hardness</span>
-								<span class="sheet-table-data sheet-center sheet-small-label" style="width:4.5em;"><input type="number" name="attr_weapon-hp" title="@{repeating_weapon_$X_weapon-hp}" value="0" style="width:2.8em;" /><br>HP</span>
-								<span class="sheet-table-data sheet-center sheet-small-label" style="width:4.5em;"><input type="number" name="attr_weapon-hp_max" title="@{repeating_weapon_$X_weapon-hp|max}" value="0" style="width:2.8em;" /><br>Max HP</span>
-							</div>
-						</div>
+					<div></div>	
+					<span class="sheet-table-data sheet-center sheet-small-label" ><input type="number" name="attr_damage-dice-num" title="@{repeating_weapon_$X_damage-dice-num}"  style="width:2.8em;" value="0" min="0" /><br>Dice</span>
+					<span class="sheet-table-data sheet-divider" style="padding-bottom: 10px;">d</span>
+					<span class="sheet-table-data sheet-center sheet-small-label" style="width:3em;" ><input type="number" name="attr_damage-die" title="@{repeating_weapon_$X_damage-die}" style="width:2.8em;" value="0" min="0" /><br>Die</span>
+					<span class="sheet-table-data sheet-divider">+</span>
+					<span class="sheet-table-data sheet-center sheet-small-label sheet-entry_med sheet-sect" ><input type="text" name="attr_damage" title="@{repeating_weapon_$X_damage}" placeholder="Damage Modifiers" /><br>DMG Mods</span>
+					<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"  ><input type="number" name="attr_damage-mod" title="@{repeating_weapon_$X_damage-mod}" value="0" style="width:2.4em;" class="sheet-calc" readonly="readonly" /><br>val</span>
+					<span class="sheet-table-data sheet-divider sheet-sect">+</span>
+					<span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:8%;">
+						<select title="@{repeating_weapon_$X_damage-ability}" name="attr_damage-ability" style="font-size:1em;">
+							<option value="0 - [[ @{condition-sickened} ]]" selected>&#8226;None</option>
+							<option value="floor(0.5 * @{STR-mod}) - [[ @{condition-sickened} ]]">1/2 STR</option>
+							<option value="floor(0.5 * @{DEX-mod}) - [[ @{condition-sickened} ]]">1/2 DEX</option>
+							<option value="floor(0.5 * @{CON-mod}) - [[ @{condition-sickened} ]]">1/2 CON</option>
+							<option value="floor(0.5 * @{INT-mod}) - [[ @{condition-sickened} ]]">1/2 INT</option>
+							<option value="floor(0.5 * @{WIS-mod}) - [[ @{condition-sickened} ]]">1/2 WIS</option>
+							<option value="floor(0.5 * @{CHA-mod}) - [[ @{condition-sickened} ]]">1/2 CHA</option>
+							<option value="@{STR-mod} - [[ @{condition-sickened} ]]" >STR</option>
+							<option value="@{DEX-mod} - [[ @{condition-sickened} ]]">DEX</option>
+							<option value="@{CON-mod} - [[ @{condition-sickened} ]]">CON</option>
+							<option value="@{INT-mod} - [[ @{condition-sickened} ]]">INT</option>
+							<option value="@{WIS-mod} - [[ @{condition-sickened} ]]">WIS</option>
+							<option value="@{CHA-mod} - [[ @{condition-sickened} ]]">CHA</option>
+							<option value="floor(1.5 * @{STR-mod}) - [[ @{condition-sickened} ]]">1.5x STR</option>
+							<option value="floor(1.5 * @{DEX-mod}) - [[ @{condition-sickened} ]]">1.5x DEX</option>
+							<option value="floor(1.5 * @{CON-mod}) - [[ @{condition-sickened} ]]">1.5x CON</option>
+							<option value="floor(1.5 * @{INT-mod}) - [[ @{condition-sickened} ]]">1.5x INT</option>
+							<option value="floor(1.5 * @{WIS-mod}) - [[ @{condition-sickened} ]]">1.5x WIS</option>
+							<option value="floor(1.5 * @{CHA-mod}) - [[ @{condition-sickened} ]]">1.5x CHA</option>
+							<option value="floor(2 * @{STR-mod}) - [[ @{condition-sickened} ]]">2x STR</option>
+							<option value="floor(2 * @{DEX-mod}) - [[ @{condition-sickened} ]]">2x DEX</option>
+							<option value="floor(2 * @{CON-mod}) - [[ @{condition-sickened} ]]">2x CON</option>
+							<option value="floor(2 * @{INT-mod}) - [[ @{condition-sickened} ]]">2x INT</option>
+							<option value="floor(2 * @{WIS-mod}) - [[ @{condition-sickened} ]]">2x WIS</option>
+							<option value="floor(2 * @{CHA-mod}) - [[ @{condition-sickened} ]]">2x CHA</option>
+						</select>
+						<br>DMG Ability
+					</span>
+					<span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:2em;" ><input style="width:2em;" type="text" name="attr_damage-ability-max" title="@{repeating_weapon_$X_damage-ability-max} for strength bows, etc." value="" Placeholder="NA" /><br/>Max</span>
+					<span class="sheet-table-data sheet-center sheet-small-label sheet-sect" ><input type="number" name="attr_damage-ability-mod" title="@{repeating_weapon_$X_attr_damage-ability-mod}" value="0" style="width:2.4em;" class="sheet-calc" readonly="readonly" /><br/>Mod</span>
+					<span class="sheet-table-data sheet-divider sheet-sect">+</span>
+					<span class="sheet-table-data sheet-center sheet-sect"><span class="sheet-table-data sheet-center sheet-small-label" ><input type="number" name="attr_dmg-effect-total-copy" title="@{repeating_weapon_$X_dmg-effect-total-copy}" value="0" style="width:2.8em;" class="sheet-calc" readonly="readonly"  /><br><b title="Additional modifier from Attack and Damage Effects.">Other</b></span></span>
+					<span class="sheet-table-data sheet-divider sheet-sect">+</span>
+					<span class="sheet-table-data sheet-center sheet-sect"><span class="sheet-table-data sheet-center sheet-small-label" ><input type="number" name="attr_DMG-mod-copy" title="@{DMG-mod} buffs and conditions" value="0" style="width:2.8em;" class="sheet-calc" readonly="readonly" /><br>Adj</span></span>
+					<span class="sheet-table-data sheet-divider sheet-sect">=</span>
+					<span class="sheet-table-data sheet-center sheet-small-label"><input type="number" name="attr_total-damage" title="@{repeating_weapon_$X_total-damage}" value="0" style="width:2.8em;" class="sheet-calc" readonly="readonly" /><br>DMG</span>
+					<span class="sheet-table-data sheet-center sheet-small-label"><input type="number" name="attr_range" title="@{repeating_weapon_$X_range}" value="0"  min="0" style="width:3.5em;"  /><br>Range</span>
+					<span class="sheet-table-data sheet-center sheet-small-label"><input type="text" name="attr_type" title="@{repeating_weapon_$X_type} Damage Type" placeholder="Damage Type" style="width:3em;"/><br>type</span>
+					<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input type="number" name="attr_weight" title="@{repeating_weapon_$X_weight}" value="0"  step="any" min="0" style="width:3em;" /><br>WT</span>
+					<span class="sheet-table-data sheet-center sheet-small-label"><input type="number" name="attr_ammo" title="@{repeating_weapon_$X_ammo}" value="0" style="width:2.8em;"  /><br>Ammo</span>
+					<div class="sheet-table sheet-sect">
+							<textarea class="sheet-weapon-notes" name="attr_notes" title="@{repeating_weapon_$X_notes}" placeholder="Weapon Notes"></textarea>
+						<span class="sheet-center sheet-small-label" style="display: block;">Notes</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5em;"><input type="number" name="attr_weapon-hardness" title="@{repeating_weapon_$X_weapon-hardness}" value="0"  step="any" min="0" style="width:3em;" /><br>Hardness</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:4.5em;"><input type="number" name="attr_weapon-hp" title="@{repeating_weapon_$X_weapon-hp}" value="0" style="width:2.8em;" /><br>HP</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:4.5em;"><input type="number" name="attr_weapon-hp_max" title="@{repeating_weapon_$X_weapon-hp|max}" value="0" style="width:2.8em;" /><br>Max HP</span>
+					</div>
+					<div class="sheet-sect sheet-expand">	
 						<b title="Add additional attacks for this weapon.">
                             Iterative Attacks
                         </b>
@@ -3275,7 +3282,7 @@
 							
 							<span class="sheet-table-data">&nbsp;</span>
 							<span class="sheet-table-data">&nbsp;</span>
-							Artistry
+							<span class="sheet-artistry">Artistry</span>
 							<input type="checkbox" class="sheet-artistry-bg-show" title="@{artistry-bg-show}" name="attr_artistry-bg-show" value="1" style="opacity: 0;width: 60px;margin: 0 -15px 0 -45px;" checked="checked" />
 							<span></span>
 							<div class="sheet-table-row"><!--used to keep these sections from collapsing on each other when hidden--></div>
@@ -4566,6 +4573,7 @@
         <b>Skills</b>
         <input type="checkbox" class="sheet-sect-show" title="@{skills-show}" name="attr_skills-show" value="1" style="width:70px; margin:0 -15px 0 -55px;" checked="checked" /><span></span>
 		<div class="sheet-table sheet-sect">
+					<input type="checkbox" class="sheet-bg_allskills-show" name="attr_BG-Skill-Use" value="1" style="display:none;"/>
 					<span class="sheet-table-name">Skills</span>
 					<div class="sheet-table-row">
 						<span class="sheet-table-header"></span>
@@ -4654,10 +4662,10 @@
 						<span class="sheet-table-data sheet-center"><input title="@{Appraise-ReqTrain}" type="checkbox" name="attr_Appraise-ReqTrain" value="1" /></span>			
 						<span class="sheet-table-data sheet-center"><textarea class="sheet-skill-macro-text" title="@{Appraise-macro}" name="attr_Appraise-macro">@{PC-whisper} &{template:pf_generic} {{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_generic}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}}  {{subtitle}} {{name=Appraise}} {{Check=[[ 1d20 + [[ @{Appraise} ]] ]]}}</textarea></span>
 					</div> 
-					
-					<span class="sheet-table-data">&nbsp;</span>
-					<span class="sheet-table-data">&nbsp;</span>
-					Artistry
+
+					<span class="sheet-table-data sheet-artistry">&nbsp;</span>
+					<span class="sheet-table-data sheet-artistry">&nbsp;</span>
+					<span class="sheet-artistry">Artistry</span>
 					<input type="checkbox" class="sheet-artistry-show" title="@{artistry-show}" name="attr_artistry-show" value="1" style="opacity: 0;width: 60px;margin: 0 -15px 0 -45px;" checked="checked" />
 					<span></span>
 					<div class="sheet-table-row"><!--used to keep these sections from collapsing on each other when hidden--></div>
@@ -5543,9 +5551,9 @@
 						<span class="sheet-table-data sheet-center"><textarea class="sheet-skill-macro-text" title="@{Linguistics-macro}" name="attr_Linguistics-macro">@{PC-whisper} &{template:pf_generic} {{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_generic}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}}  {{subtitle}} {{name=Linguistics}} {{Check=[[ 1d20 + [[ @{Linguistics} ]] ]]}}</textarea></span>
 					</div>
 					
-					<span class="sheet-table-data">&nbsp;</span>
-					<span class="sheet-table-data">&nbsp;</span>
-					Lore
+					<span class="sheet-table-data sheet-lore">&nbsp;</span>
+					<span class="sheet-table-data sheet-lore">&nbsp;</span>
+					<span class="sheet-lore">Lore</span>
 					<input type="checkbox" class="sheet-lore-show" title="@{lore-show}" name="attr_lore-show" value="1" style="opacity: 0;width: 50px;margin: 0 -15px 0 -35px;" checked="checked" />
 					<span></span>
 					<div class="sheet-table-row"><!--used to keep these sections from collapsing on each other when hidden--></div>
@@ -6410,11 +6418,11 @@
                         <span class="sheet-table-data sheet-center"></span>
                         <span class="sheet-table-data sheet-center sheet-repeating-rollbutton"><button type="roll" name="attr_roll" title="%{selected|repeating_feat_$X_roll}" value="@{macro-text}"></button></span>
                         <span class="sheet-table-data sheet-center sheet-small-label" style="width:32%;"><input title="@{repeating_feat_$X_name}" type="text" name="attr_name" placeholder="Feat Name" accept="Name"><br>Name</span>
-                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:32%;"><textarea class="sheet-weapon-notes" title="@{repeating_feat_$X_short-description}" name="attr_short-description" placeholder="Short Desc"></textarea><br>Short Desc</span>
-                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:4%;"><input title="@{repeating_feat_$X_used}" type="number" name="attr_used" value="0" /><br>Used</span>
-						<span class="sheet-table-data sheet-divider-lg">/</span>
-                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:4%;"><input title="@{repeating_feat_$X_used|max}" type="text" name="attr_used_max" value="0" class="sheet-calc" readonly="readonly" /><br>Max</span>
-                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:16%;"><input title="@{repeating_feat_$X_max-calculation}" type="text" name="attr_max-calculation" value="" Placeholder="macro" /><br>Calc</span>
+                        <span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:32%;"><textarea class="sheet-weapon-notes" title="@{repeating_feat_$X_short-description}" name="attr_short-description" placeholder="Short Desc"></textarea><br>Short Desc</span>
+                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:.1%;"><input title="@{repeating_feat_$X_used}" type="number" name="attr_used" value="0" /><br>Used</span>
+						<span class="sheet-table-data sheet-divider-lg" style="width:.1%;">/</span>
+                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:.1%;"><input title="@{repeating_feat_$X_used|max}" type="text" name="attr_used_max" value="0" class="sheet-calc" readonly="readonly" /><br>Max</span>
+                        <span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:15%;"><input title="@{repeating_feat_$X_max-calculation}" type="text" name="attr_max-calculation" value="" Placeholder="macro" /><br>Calc</span>
 						<div class="sheet-sect sheet-expand">
 							<b>Description</b>
 							<input type="checkbox" class="sheet-desc-show" title="@{repeating_feat_$X_description-show}" name="attr_description-show" value="1" style="opacity:0; width:90px; height:1.5em; position:relative; top:0; left:0; margin:0 -15px 0 -75px; cursor:pointer; z-index:1;" checked="checked" /><span></span>
@@ -6459,11 +6467,11 @@
                             <span class="sheet-table-data sheet-center"></span>
                             <span class="sheet-table-data sheet-center sheet-repeating-rollbutton"><button type="roll" name="attr_roll" title="%{selected|repeating_mythic-feat_$X_roll}" value="@{macro-text}"></button></span>
                             <span class="sheet-table-data sheet-center sheet-small-label" style="width:24%;"><input title="@{repeating_mythic-feat_$X_name}" type="text" name="attr_name" placeholder="Mythic Feat Name"><br>Name</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:40%;"><input title="@{repeating_mythic-feat_$X_short-description}" type="text" name="attr_short-description" placeholder="Short Description"><br>Short Desc</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:4%;"><input title="@{repeating_mythic-feat_$X_used}" type="number" name="attr_used" value="0" /><br>Uses</span>
-                            <span class="sheet-table-data sheet-divider-lg">/</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:4%;"><input title="@{repeating_mythic-feat_$X_used|max}" type="number" name="attr_used_max" value="0" class="sheet-calc" readonly="readonly" /><br>Max</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><input title="@{repeating_mythic-feat_$X_max-calculation}" type="text" name="attr_max-calculation" value="" Placeholder="macro" /><br>Max Calc</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:40%;"><input title="@{repeating_mythic-feat_$X_short-description}" type="text" name="attr_short-description" placeholder="Short Description"><br>Short Desc</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:.1%;"><input title="@{repeating_mythic-feat_$X_used}" type="number" name="attr_used" value="0" /><br>Uses</span>
+                            <span class="sheet-table-data sheet-divider-lg" style="width:.1%;">/</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:.1%;"><input title="@{repeating_mythic-feat_$X_used|max}" type="number" name="attr_used_max" value="0" class="sheet-calc" readonly="readonly" /><br>Max</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:20%;"><input title="@{repeating_mythic-feat_$X_max-calculation}" type="text" name="attr_max-calculation" value="" Placeholder="macro" /><br>Max Calc</span>
                             <div class="sheet-sect sheet-expand">
                                 <b>Description</b>
                                 <input type="checkbox" class="sheet-desc-show" title="@{repeating_mythic-feat_$X_description-show}" name="attr_description-show" value="1" style="opacity:0; width:90px; height:1.5em; position:relative; top:0; left:0; margin:0 -15px 0 -75px; cursor:pointer; z-index:1;" checked="checked" /><span></span>
@@ -6745,23 +6753,23 @@
                     <span class="sheet-table-data sheet-center"></span>
                     <span class="sheet-table-data sheet-center sheet-repeating-rollbutton"><button type="roll" name="attr_roll" title="%{selected|repeating_item_$X_item-roll}" value="@{macro-text}"></button></span>
                     <span class="sheet-table-data sheet-center sheet-small-label" style="width:18%;"><input title="@{repeating_item_$X_name}" type="text" name="attr_name" placeholder="Item Name"><br>Name</span>
-                    <span class="sheet-table-data sheet-center sheet-small-label" style="width:40%;"><input title="@{repeating_item_$X_short-description}" type="text" name="attr_short-description" placeholder="Short Description"><br>Short Desc</span>
-                    <span class="sheet-table-data sheet-center sheet-small-label" style="width:8%;">
+                    <span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:40%;"><input title="@{repeating_item_$X_short-description}" type="text" name="attr_short-description" placeholder="Short Description"><br>Short Desc</span>
+                    <span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:8%;">
                         <select style="width:100%;" title="@{repeating_item_$X_location}" name="attr_location" class="sheet-select-small">
                             <option value="0" selected>&#8226;Carried</option>
                             <option value="1">Not Carried</option>
                         </select>
                         <br>Location
                     </span>
-                    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_item_$X_qty}" type="number" name="attr_qty" value="0" /><br />ChrgQty</span>
-					<span class="sheet-table-data sheet-divider-lg" >/</span>
-                    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_item_$X_qty|max" type="number" name="attr_qty_max" value="0" /><br>Max</span>
-                    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_item_$X_weight}" type="number" name="attr_weight" value="0" step="any" min="0" /><br>Wt</span>
-                    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_item_$X_hardness}" type="number" name="attr_hardness" value="0" step="any" min="0" /><br>Hard</span>
-                    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_item_$X_hp}" type="number" name="attr_hp" value="0" step="any" min="0" /><br>HP</span>
-                    <span class="sheet-table-data sheet-divider-lg">/</span>
-                    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%; min-width:4em;"><input title="@{repeating_item_$X_hp|max}" type="number" name="attr_hp_max" value="0" step="any" min="0" /><br>Max</span>
-                    <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_item_$X_value}" type="number" name="attr_value" value="0" step="any" min="0" /><br>Value</span>
+                    <span class="sheet-table-data sheet-center sheet-small-label" style="width:.1%;"><input title="@{repeating_item_$X_qty}" type="number" name="attr_qty" value="0" /><br />ChrgQty</span>
+					<span class="sheet-table-data sheet-divider-lg" style="width:.1%;">/</span>
+                    <span class="sheet-table-data sheet-center sheet-small-label" style="width:.1%;"><input title="@{repeating_item_$X_qty|max" type="number" name="attr_qty_max" value="0" /><br>Max</span>
+                    <span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:.1%;"><input title="@{repeating_item_$X_weight}" type="number" name="attr_weight" value="0" step="any" min="0" /><br>Wt</span>
+                    <span class="sheet-table-data sheet-center sheet-small-label" style="width:.1%;"><input title="@{repeating_item_$X_hardness}" type="number" name="attr_hardness" value="0" step="any" min="0" /><br>Hard</span>
+                    <span class="sheet-table-data sheet-center sheet-small-label" style="width:.1%;"><input title="@{repeating_item_$X_hp}" type="number" name="attr_hp" value="0" step="any" min="0" /><br>HP</span>
+                    <span class="sheet-table-data sheet-divider-lg" style="width:.1%;">/</span>
+                    <span class="sheet-table-data sheet-center sheet-small-label" style="width:.1%; min-width:4em;"><input title="@{repeating_item_$X_hp|max}" type="number" name="attr_hp_max" value="0" step="any" min="0" /><br>Max</span>
+                    <span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:.1%;"><input title="@{repeating_item_$X_value}" type="number" name="attr_value" value="0" step="any" min="0" /><br>Value</span>
 					<div class="sheet-sect sheet-expand">
 						<b>Description</b>
 						<input type="checkbox" class="sheet-desc-show" title="@{repeating_item_$X_description-show}" name="attr_description-show" value="1" style="opacity:0; width:90px; height:1.5em; position:relative; top:0; left:0; margin:0 -15px 0 -75px; cursor:pointer; z-index:1;" /><span></span>
@@ -7838,35 +7846,35 @@
 								<br>Class
 								</span>
 								<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-0-spells_$X_spell_level}" type="number" value="0" name="attr_spell_level" /><br>Level</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_$X_school}" type="text" value="" name="attr_school" placeholder="Spell School [descriptor]" accept="School"><br>School</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_$X_cast-time}" type="text" value="" name="attr_cast-time" placeholder="Casting Time" accept="Casting Time"/><br>Casting Time</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_$X_isDomain}" type="checkbox" value="1" name="attr_isDomain" /><br>Domain</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_$X_DC_misc}" type="number" value="0" name="attr_DC_misc" placeholder="DC Mod" /> <br>DC Mod</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-0-spells_$X_school}" type="text" value="" name="attr_school" placeholder="Spell School [descriptor]" accept="School"><br>School</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-0-spells_$X_cast-time}" type="text" value="" name="attr_cast-time" placeholder="Casting Time" accept="Casting Time"/><br>Casting Time</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-0-spells_$X_isDomain}" type="checkbox" value="1" name="attr_isDomain" /><br>Domain</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-0-spells_$X_DC_misc}" type="number" value="0" name="attr_DC_misc" placeholder="DC Mod" /> <br>DC Mod</span>
 								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_$X_savedc}" type="number" value="0" name="attr_savedc" class="sheet-calc" readonly="readonly" /> <br>DC</span>			
-								<div class="sheet-sect sheet-expand">
-									<div class="sheet-table">
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_$X_components}" type="text" value="" name="attr_components" placeholder="Components" accept="Components"><br>Components</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_$X_range}" type="text" value="" name="attr_range" placeholder="Range" accept="Range"><br>Range</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_$X_range_numeric}" type="number" value="0" name="attr_range_numeric" placeholder="0" class="sheet-calc" readonly="readonly"><br>Range</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label">
-                                            <input title="@{repeating_lvl-0-spells_$X_targets}" type="text" value="" name="attr_targets" placeholder="Targets/Area/Effect" accept="Target">
-											<input type="hidden" value="" name="attr_targets" accept="Area">
-											<input type="hidden" value="" name="attr_targets" accept="Effect">
-											<br>Targets/Area/Effect
-										</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_$X_duration}" type="text" value="" name="attr_duration" placeholder="Duration" accept="Duration"/><br>Duration</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-0-spells_$X_save}" type="text" value="" name="attr_save" placeholder="Save Effect" accept="Saving Throw"><br>Save Effect</span>
-										<span class="sheet-table-data sheet-center sheet-small-label">
-											<select title="@{repeating_lvl-0-spells_$X_sr}" name="attr_sr" accept="Spell Resistance">
-												<option value="" selected>&#8226;N/A</option>
-												<option value="Yes">Yes</option>
-												<option value="No">No</option>
-												<option value="Yes (Harmless)">Yes (Harmless)</option>
-												<option value="No (Harmless)">No (Harmless)</option>
-											</select>
-											<br>SR
-										</span>
-									</div>
+								<div></div>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-0-spells_$X_components}" type="text" value="" name="attr_components" placeholder="Components" accept="Components"><br>Components</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-0-spells_$X_range}" type="text" value="" name="attr_range" placeholder="Range" accept="Range"><br>Range</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-0-spells_$X_range_numeric}" type="number" value="0" name="attr_range_numeric" placeholder="0" class="sheet-calc" readonly="readonly"><br>Range</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label sheet-sect">
+                                    <input title="@{repeating_lvl-0-spells_$X_targets}" type="text" value="" name="attr_targets" placeholder="Targets/Area/Effect" accept="Target">
+									<input type="hidden" value="" name="attr_targets" accept="Area">
+									<input type="hidden" value="" name="attr_targets" accept="Effect">
+									<br>Targets/Area/Effect
+								</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-0-spells_$X_duration}" type="text" value="" name="attr_duration" placeholder="Duration" accept="Duration"/><br>Duration</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-0-spells_$X_save}" type="text" value="" name="attr_save" placeholder="Save Effect" accept="Saving Throw"><br>Save Effect</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect">
+									<select title="@{repeating_lvl-0-spells_$X_sr}" name="attr_sr" accept="Spell Resistance">
+										<option value="" selected>&#8226;N/A</option>
+										<option value="Yes">Yes</option>
+										<option value="No">No</option>
+										<option value="Yes (Harmless)">Yes (Harmless)</option>
+										<option value="No (Harmless)">No (Harmless)</option>
+									</select>
+									<br>SR
+								</span>
+								
+								<div class="sheet-sect sheet-expand">	
 									<b>Misc</b>
                                     <input type="checkbox" class="sheet-spell-misc-show" title="@{repeating_lvl-0-spells_$X_spell-misc-show}" name="attr_spell-misc-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;" checked="checked" /><span></span>
 									<b>Description</b>
@@ -7990,35 +7998,35 @@
 									<br>Class
 								</span>
 								<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-1-spells_$X_spell_level}" type="number" value="1" name="attr_spell_level" /><br>Level</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_$X_school}" type="text" value="" name="attr_school" placeholder="Spell School [descriptor]" accept="School"><br>School</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_$X_cast-time}" type="text" value="" name="attr_cast-time" placeholder="Casting Time" accept="Casting Time"/><br>Casting Time</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_$X_isDomain}" type="checkbox" value="1" name="attr_isDomain" /><br>Domain</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_$X_DC_misc}" type="number" value="0" name="attr_DC_misc" placeholder="DC Mod" /> <br>DC Mod</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-1-spells_$X_school}" type="text" value="" name="attr_school" placeholder="Spell School [descriptor]" accept="School"><br>School</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-1-spells_$X_cast-time}" type="text" value="" name="attr_cast-time" placeholder="Casting Time" accept="Casting Time"/><br>Casting Time</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-1-spells_$X_isDomain}" type="checkbox" value="1" name="attr_isDomain" /><br>Domain</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-1-spells_$X_DC_misc}" type="number" value="0" name="attr_DC_misc" placeholder="DC Mod" /> <br>DC Mod</span>
 								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_$X_savedc}" type="number" value="0" name="attr_savedc" class="sheet-calc" readonly="readonly" /> <br>DC</span>			
-								<div class="sheet-sect sheet-expand">
-									<div class="sheet-table">
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_$X_components}" type="text" value="" name="attr_components" placeholder="Components" accept="Components"><br>Components</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_$X_range}" type="text" value="" name="attr_range" placeholder="Range" accept="Range"><br>Range</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_$X_range_numeric}" type="number" value="0" name="attr_range_numeric" placeholder="0" class="sheet-calc" readonly="readonly"><br>Range</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label">
-                                            <input title="@{repeating_lvl-1-spells_$X_targets}" type="text" value="" name="attr_targets" placeholder="Targets/Area/Effect" accept="Target">
-											<input type="hidden" value="" name="attr_targets" accept="Area">
-											<input type="hidden" value="" name="attr_targets" accept="Effect">
-											<br>Targets/Area/Effect
-										</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_$X_duration}" type="text" value="" name="attr_duration" placeholder="Duration" accept="Duration" /><br>Duration</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-1-spells_$X_save}" type="text" value="" name="attr_save" placeholder="Save Effect" accept="Saving Throw"><br>Save Effect</span>
-										<span class="sheet-table-data sheet-center sheet-small-label">
-											<select title="@{repeating_lvl-1-spells_$X_sr}" name="attr_sr" accept="Spell Resistance">
-												<option value="" selected>&#8226;N/A</option>
-												<option value="Yes">Yes</option>
-												<option value="No">No</option>
-												<option value="Yes (Harmless)">Yes (Harmless)</option>
-												<option value="No (Harmless)">No (Harmless)</option>
-											</select>
-											<br>SR
-										</span>
-									</div>
+								<div></div>									
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-1-spells_$X_components}" type="text" value="" name="attr_components" placeholder="Components" accept="Components"><br>Components</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-1-spells_$X_range}" type="text" value="" name="attr_range" placeholder="Range" accept="Range"><br>Range</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-1-spells_$X_range_numeric}" type="number" value="0" name="attr_range_numeric" placeholder="0" class="sheet-calc" readonly="readonly"><br>Range</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label sheet-sect">
+                                    <input title="@{repeating_lvl-1-spells_$X_targets}" type="text" value="" name="attr_targets" placeholder="Targets/Area/Effect" accept="Target">
+									<input type="hidden" value="" name="attr_targets" accept="Area">
+									<input type="hidden" value="" name="attr_targets" accept="Effect">
+									<br>Targets/Area/Effect
+								</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-1-spells_$X_duration}" type="text" value="" name="attr_duration" placeholder="Duration" accept="Duration" /><br>Duration</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-1-spells_$X_save}" type="text" value="" name="attr_save" placeholder="Save Effect" accept="Saving Throw"><br>Save Effect</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect">
+									<select title="@{repeating_lvl-1-spells_$X_sr}" name="attr_sr" accept="Spell Resistance">
+										<option value="" selected>&#8226;N/A</option>
+										<option value="Yes">Yes</option>
+										<option value="No">No</option>
+										<option value="Yes (Harmless)">Yes (Harmless)</option>
+										<option value="No (Harmless)">No (Harmless)</option>
+									</select>
+									<br>SR
+								</span>
+									
+								<div class="sheet-sect sheet-expand">	
 									<b>Misc</b>
                                     <input type="checkbox" class="sheet-spell-misc-show" title="@{repeating_lvl-1-spells_$X_spell-misc-show}" name="attr_spell-misc-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;" checked="checked" /><span></span>
 									<b>Description</b>
@@ -8142,35 +8150,34 @@
 								<br>Class
 								</span>
 								<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-2-spells_$X_spell_level}" type="number" value="2" name="attr_spell_level" /><br>Level</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_$X_school}" type="text" value="" name="attr_school" placeholder="Spell School [descriptor]" accept="School"><br>School</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_$X_cast-time}" type="text" value="" name="attr_cast-time" placeholder="Casting Time" accept="Casting Time"/><br>Casting Time</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_$X_isDomain}" type="checkbox" value="1" name="attr_isDomain" /><br>Domain</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_$X_DC_misc}" type="number" value="0" name="attr_DC_misc" placeholder="DC Mod" /> <br>DC Mod</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-2-spells_$X_school}" type="text" value="" name="attr_school" placeholder="Spell School [descriptor]" accept="School"><br>School</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-2-spells_$X_cast-time}" type="text" value="" name="attr_cast-time" placeholder="Casting Time" accept="Casting Time"/><br>Casting Time</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-2-spells_$X_isDomain}" type="checkbox" value="1" name="attr_isDomain" /><br>Domain</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-2-spells_$X_DC_misc}" type="number" value="0" name="attr_DC_misc" placeholder="DC Mod" /> <br>DC Mod</span>
 								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_$X_savedc}" type="number" value="0" name="attr_savedc" class="sheet-calc" readonly="readonly" /> <br>DC</span>			
-								<div class="sheet-sect sheet-expand">
-									<div class="sheet-table">
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_$X_components}" type="text" value="" name="attr_components" placeholder="Components" accept="Components"><br>Components</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_$X_range}" type="text" value="" name="attr_range" placeholder="Range" accept="Range"><br>Range</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_$X_range_numeric}" type="number" value="0" name="attr_range_numeric" placeholder="0" class="sheet-calc" readonly="readonly"><br>Range</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label">
-                                            <input title="@{repeating_lvl-2-spells_$X_targets}" type="text" value="" name="attr_targets" placeholder="Targets/Area/Effect" accept="Target">
-											<input type="hidden" value="" name="attr_targets" accept="Area">
-											<input type="hidden" value="" name="attr_targets" accept="Effect">
-											<br>Targets/Area/Effect
-										</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_$X_duration}" type="text" value="" name="attr_duration" placeholder="Duration" accept="Duration"/><br>Duration</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-2-spells_$X_save}" type="text" value="" name="attr_save" placeholder="Save Effect" accept="Saving Throw"><br>Save Effect</span>
-										<span class="sheet-table-data sheet-center sheet-small-label">
-											<select title="@{repeating_lvl-2-spells_$X_sr}" name="attr_sr" accept="Spell Resistance">
-												<option value="" selected>&#8226;N/A</option>
-												<option value="Yes">Yes</option>
-												<option value="No">No</option>
-												<option value="Yes (Harmless)">Yes (Harmless)</option>
-												<option value="No (Harmless)">No (Harmless)</option>
-											</select>
-											<br>SR
-										</span>
-									</div>
+								<div></div>									
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-2-spells_$X_components}" type="text" value="" name="attr_components" placeholder="Components" accept="Components"><br>Components</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-2-spells_$X_range}" type="text" value="" name="attr_range" placeholder="Range" accept="Range"><br>Range</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-2-spells_$X_range_numeric}" type="number" value="0" name="attr_range_numeric" placeholder="0" class="sheet-calc" readonly="readonly"><br>Range</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label sheet-sect">
+                                    <input title="@{repeating_lvl-2-spells_$X_targets}" type="text" value="" name="attr_targets" placeholder="Targets/Area/Effect" accept="Target">
+									<input type="hidden" value="" name="attr_targets" accept="Area">
+									<input type="hidden" value="" name="attr_targets" accept="Effect">
+									<br>Targets/Area/Effect
+								</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-2-spells_$X_duration}" type="text" value="" name="attr_duration" placeholder="Duration" accept="Duration"/><br>Duration</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-2-spells_$X_save}" type="text" value="" name="attr_save" placeholder="Save Effect" accept="Saving Throw"><br>Save Effect</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect">
+									<select title="@{repeating_lvl-2-spells_$X_sr}" name="attr_sr" accept="Spell Resistance">
+										<option value="" selected>&#8226;N/A</option>
+										<option value="Yes">Yes</option>
+										<option value="No">No</option>
+										<option value="Yes (Harmless)">Yes (Harmless)</option>
+										<option value="No (Harmless)">No (Harmless)</option>
+									</select>
+									<br>SR
+								</span>									
+								<div class="sheet-sect sheet-expand">	
 									<b>Misc</b>
                                     <input type="checkbox" class="sheet-spell-misc-show" title="@{repeating_lvl-2-spells_$X_spell-misc-show}" name="attr_spell-misc-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;" checked="checked" /><span></span>
 									<b>Description</b>
@@ -8294,35 +8301,34 @@
 									<br>Class
 								</span>
 								<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-3-spells_$X_spell_level}" type="number" value="3" name="attr_spell_level" /><br>Level</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_$X_school}" type="text" value="" name="attr_school" placeholder="Spell School [descriptor]" accept="School"><br>School</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_$X_cast-time}" type="text" value="" name="attr_cast-time" placeholder="Casting Time" accept="Casting Time"/><br>Casting Time</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_$X_isDomain}" type="checkbox" value="1" name="attr_isDomain" /><br>Domain</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_$X_DC_misc}" type="number" value="0" name="attr_DC_misc" placeholder="DC Mod" /> <br>DC Mod</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-3-spells_$X_school}" type="text" value="" name="attr_school" placeholder="Spell School [descriptor]" accept="School"><br>School</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-3-spells_$X_cast-time}" type="text" value="" name="attr_cast-time" placeholder="Casting Time" accept="Casting Time"/><br>Casting Time</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-3-spells_$X_isDomain}" type="checkbox" value="1" name="attr_isDomain" /><br>Domain</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-3-spells_$X_DC_misc}" type="number" value="0" name="attr_DC_misc" placeholder="DC Mod" /> <br>DC Mod</span>
 								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_$X_savedc}" type="number" value="0" name="attr_savedc" class="sheet-calc" readonly="readonly" /> <br>DC</span>			
+								<div></div>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-3-spells_$X_components}" type="text" value="" name="attr_components" placeholder="Components" accept="Components"><br>Components</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-3-spells_$X_range}" type="text" value="" name="attr_range" placeholder="Range" accept="Range"><br>Range</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-3-spells_$X_range_numeric}" type="number" value="0" name="attr_range_numeric" placeholder="0" class="sheet-calc" readonly="readonly"><br>Range</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label sheet-sect">
+                                    <input title="@{repeating_lvl-3-spells_$X_targets}" type="text" value="" name="attr_targets" placeholder="Targets/Area/Effect" accept="Target">
+									<input type="hidden" value="" name="attr_targets" accept="Area">
+									<input type="hidden" value="" name="attr_targets" accept="Effect">
+									<br>Targets/Area/Effect
+								</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-3-spells_$X_duration}" type="text" value="" name="attr_duration" placeholder="Duration" accept="Duration"/><br>Duration</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-3-spells_$X_save}" type="text" value="" name="attr_save" placeholder="Save Effect" accept="Saving Throw"><br>Save Effect</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect">
+									<select title="@{repeating_lvl-3-spells_$X_sr}" name="attr_sr" accept="Spell Resistance">
+										<option value="" selected>&#8226;N/A</option>
+										<option value="Yes">Yes</option>
+										<option value="No">No</option>
+										<option value="Yes (Harmless)">Yes (Harmless)</option>
+										<option value="No (Harmless)">No (Harmless)</option>
+									</select>
+									<br>SR
+								</span>									
 								<div class="sheet-sect sheet-expand">
-									<div class="sheet-table">
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_$X_components}" type="text" value="" name="attr_components" placeholder="Components" accept="Components"><br>Components</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_$X_range}" type="text" value="" name="attr_range" placeholder="Range" accept="Range"><br>Range</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_$X_range_numeric}" type="number" value="0" name="attr_range_numeric" placeholder="0" class="sheet-calc" readonly="readonly"><br>Range</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label">
-                                            <input title="@{repeating_lvl-3-spells_$X_targets}" type="text" value="" name="attr_targets" placeholder="Targets/Area/Effect" accept="Target">
-											<input type="hidden" value="" name="attr_targets" accept="Area">
-											<input type="hidden" value="" name="attr_targets" accept="Effect">
-											<br>Targets/Area/Effect
-										</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_$X_duration}" type="text" value="" name="attr_duration" placeholder="Duration" accept="Duration"/><br>Duration</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-3-spells_$X_save}" type="text" value="" name="attr_save" placeholder="Save Effect" accept="Saving Throw"><br>Save Effect</span>
-										<span class="sheet-table-data sheet-center sheet-small-label">
-											<select title="@{repeating_lvl-3-spells_$X_sr}" name="attr_sr" accept="Spell Resistance">
-												<option value="" selected>&#8226;N/A</option>
-												<option value="Yes">Yes</option>
-												<option value="No">No</option>
-												<option value="Yes (Harmless)">Yes (Harmless)</option>
-												<option value="No (Harmless)">No (Harmless)</option>
-											</select>
-											<br>SR
-										</span>
-									</div>
 									<b>Misc</b>
                                     <input type="checkbox" class="sheet-spell-misc-show" title="@{repeating_lvl-3-spells_$X_spell-misc-show}" name="attr_spell-misc-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;" checked="checked" /><span></span>
 									<b>Description</b>
@@ -8446,35 +8452,34 @@
 								<br>Class
 								</span>
 								<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-4-spells_$X_spell_level}" type="number" value="4" name="attr_spell_level" /><br>Level</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_$X_school}" type="text" value="" name="attr_school" placeholder="Spell School [descriptor]" accept="School"><br>School</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_$X_cast-time}" type="text" value="" name="attr_cast-time" placeholder="Casting Time" accept="Casting Time"/><br>Casting Time</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_$X_isDomain}" type="checkbox" value="1" name="attr_isDomain" /><br>Domain</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_$X_DC_misc}" type="number" value="0" name="attr_DC_misc" placeholder="DC Mod" /> <br>DC Mod</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-4-spells_$X_school}" type="text" value="" name="attr_school" placeholder="Spell School [descriptor]" accept="School"><br>School</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-4-spells_$X_cast-time}" type="text" value="" name="attr_cast-time" placeholder="Casting Time" accept="Casting Time"/><br>Casting Time</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-4-spells_$X_isDomain}" type="checkbox" value="1" name="attr_isDomain" /><br>Domain</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-4-spells_$X_DC_misc}" type="number" value="0" name="attr_DC_misc" placeholder="DC Mod" /> <br>DC Mod</span>
 								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_$X_savedc}" type="number" value="0" name="attr_savedc" class="sheet-calc" readonly="readonly" /> <br>DC</span>			
-								<div class="sheet-sect sheet-expand">
-									<div class="sheet-table">
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_$X_components}" type="text" value="" name="attr_components" placeholder="Components" accept="Components"><br>Components</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_$X_range}" type="text" value="" name="attr_range" placeholder="Range" accept="Range"><br>Range</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_$X_range_numeric}" type="number" value="0" name="attr_range_numeric" placeholder="0" class="sheet-calc" readonly="readonly"><br>Range</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label">
-                                            <input title="@{repeating_lvl-4-spells_$X_targets}" type="text" value="" name="attr_targets" placeholder="Targets/Area/Effect" accept="Target">
-											<input type="hidden" value="" name="attr_targets" accept="Area">
-											<input type="hidden" value="" name="attr_targets" accept="Effect">
-											<br>Targets/Area/Effect
-										</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_$X_duration}" type="text" value="" name="attr_duration" placeholder="Duration" accept="Duration" /><br>Duration</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-4-spells_$X_save}" type="text" value="" name="attr_save" placeholder="Save Effect" accept="Saving Throw"><br>Save Effect</span>
-										<span class="sheet-table-data sheet-center sheet-small-label">
-											<select title="@{repeating_lvl-4-spells_$X_sr}" name="attr_sr" accept="Spell Resistance">
-												<option value="" selected>&#8226;N/A</option>
-												<option value="Yes">Yes</option>
-												<option value="No">No</option>
-												<option value="Yes (Harmless)">Yes (Harmless)</option>
-												<option value="No (Harmless)">No (Harmless)</option>
-											</select>
-											<br>SR
-										</span>
-									</div>
+								<div></div>									
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-4-spells_$X_components}" type="text" value="" name="attr_components" placeholder="Components" accept="Components"><br>Components</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-4-spells_$X_range}" type="text" value="" name="attr_range" placeholder="Range" accept="Range"><br>Range</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-4-spells_$X_range_numeric}" type="number" value="0" name="attr_range_numeric" placeholder="0" class="sheet-calc" readonly="readonly"><br>Range</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label sheet-sect">
+                                    <input title="@{repeating_lvl-4-spells_$X_targets}" type="text" value="" name="attr_targets" placeholder="Targets/Area/Effect" accept="Target">
+									<input type="hidden" value="" name="attr_targets" accept="Area">
+									<input type="hidden" value="" name="attr_targets" accept="Effect">
+									<br>Targets/Area/Effect
+								</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-4-spells_$X_duration}" type="text" value="" name="attr_duration" placeholder="Duration" accept="Duration" /><br>Duration</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-4-spells_$X_save}" type="text" value="" name="attr_save" placeholder="Save Effect" accept="Saving Throw"><br>Save Effect</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect">
+									<select title="@{repeating_lvl-4-spells_$X_sr}" name="attr_sr" accept="Spell Resistance">
+										<option value="" selected>&#8226;N/A</option>
+										<option value="Yes">Yes</option>
+										<option value="No">No</option>
+										<option value="Yes (Harmless)">Yes (Harmless)</option>
+										<option value="No (Harmless)">No (Harmless)</option>
+									</select>
+									<br>SR
+								</span>									
+								<div class="sheet-sect sheet-expand">	
 									<b>Misc</b>
                                     <input type="checkbox" class="sheet-spell-misc-show" title="@{repeating_lvl-4-spells_$X_spell-misc-show}" name="attr_spell-misc-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;" checked="checked" /><span></span>
 									<b>Description</b>
@@ -8598,35 +8603,34 @@
 								<br>Class
 								</span>
 								<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-5-spells_$X_spell_level}" type="number" value="5" name="attr_spell_level" /><br>Level</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_$X_school}" type="text" value="" name="attr_school" placeholder="Spell School [descriptor]" accept="School"><br>School</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_$X_cast-time}" type="text" value="" name="attr_cast-time" placeholder="Casting Time" accept="Casting Time"/><br>Casting Time</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_$X_isDomain}" type="checkbox" value="1" name="attr_isDomain" /><br>Domain</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_$X_DC_misc}" type="number" value="0" name="attr_DC_misc" placeholder="DC Mod" /> <br>DC Mod</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-5-spells_$X_school}" type="text" value="" name="attr_school" placeholder="Spell School [descriptor]" accept="School"><br>School</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-5-spells_$X_cast-time}" type="text" value="" name="attr_cast-time" placeholder="Casting Time" accept="Casting Time"/><br>Casting Time</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-5-spells_$X_isDomain}" type="checkbox" value="1" name="attr_isDomain" /><br>Domain</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-5-spells_$X_DC_misc}" type="number" value="0" name="attr_DC_misc" placeholder="DC Mod" /> <br>DC Mod</span>
 								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_$X_savedc}" type="number" value="0" name="attr_savedc" class="sheet-calc" readonly="readonly" /> <br>DC</span>			
+								<div></div>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-5-spells_$X_components}" type="text" value="" name="attr_components" placeholder="Components" accept="Components"><br>Components</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-5-spells_$X_range}" type="text" value="" name="attr_range" placeholder="Range" accept="Range"><br>Range</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-5-spells_$X_range_numeric}" type="number" value="0" name="attr_range_numeric" placeholder="0" class="sheet-calc" readonly="readonly"><br>Range</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label sheet-sect">
+                                    <input title="@{repeating_lvl-5-spells_$X_targets}" type="text" value="" name="attr_targets" placeholder="Targets/Area/Effect" accept="Target">
+									<input type="hidden" value="" name="attr_targets" accept="Area">
+									<input type="hidden" value="" name="attr_targets" accept="Effect">
+									<br>Targets/Area/Effect
+								</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-5-spells_$X_duration}" type="text" value="" name="attr_duration" placeholder="Duration" accept="Duration"/><br>Duration</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-5-spells_$X_save}" type="text" value="" name="attr_save" placeholder="Save Effect" accept="Saving Throw"><br>Save Effect</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect">
+									<select title="@{repeating_lvl-5-spells_$X_sr}" name="attr_sr" accept="Spell Resistance">
+										<option value="" selected>&#8226;N/A</option>
+										<option value="Yes">Yes</option>
+										<option value="No">No</option>
+										<option value="Yes (Harmless)">Yes (Harmless)</option>
+										<option value="No (Harmless)">No (Harmless)</option>
+									</select>
+									<br>SR
+								</span>									
 								<div class="sheet-sect sheet-expand">
-									<div class="sheet-table">
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_$X_components}" type="text" value="" name="attr_components" placeholder="Components" accept="Components"><br>Components</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_$X_range}" type="text" value="" name="attr_range" placeholder="Range" accept="Range"><br>Range</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_$X_range_numeric}" type="number" value="0" name="attr_range_numeric" placeholder="0" class="sheet-calc" readonly="readonly"><br>Range</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label">
-                                            <input title="@{repeating_lvl-5-spells_$X_targets}" type="text" value="" name="attr_targets" placeholder="Targets/Area/Effect" accept="Target">
-											<input type="hidden" value="" name="attr_targets" accept="Area">
-											<input type="hidden" value="" name="attr_targets" accept="Effect">
-											<br>Targets/Area/Effect
-										</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_$X_duration}" type="text" value="" name="attr_duration" placeholder="Duration" accept="Duration"/><br>Duration</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-5-spells_$X_save}" type="text" value="" name="attr_save" placeholder="Save Effect" accept="Saving Throw"><br>Save Effect</span>
-										<span class="sheet-table-data sheet-center sheet-small-label">
-											<select title="@{repeating_lvl-5-spells_$X_sr}" name="attr_sr" accept="Spell Resistance">
-												<option value="" selected>&#8226;N/A</option>
-												<option value="Yes">Yes</option>
-												<option value="No">No</option>
-												<option value="Yes (Harmless)">Yes (Harmless)</option>
-												<option value="No (Harmless)">No (Harmless)</option>
-											</select>
-											<br>SR
-										</span>
-									</div>
 									<b>Misc</b>
                                     <input type="checkbox" class="sheet-spell-misc-show" title="@{repeating_lvl-5-spells_$X_spell-misc-show}" name="attr_spell-misc-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;" checked="checked" /><span></span>
 									<b>Description</b>
@@ -8750,35 +8754,34 @@
 								<br>Class
 								</span>
 								<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-6-spells_$X_spell_level}" type="number" value="6" name="attr_spell_level" /><br>Level</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_$X_school}" type="text" value="" name="attr_school" placeholder="Spell School [descriptor]" accept="School"><br>School</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_$X_cast-time}" type="text" value="" name="attr_cast-time" placeholder="Casting Time" accept="Casting Time"/><br>Casting Time</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_$X_isDomain}" type="checkbox" value="1" name="attr_isDomain" /><br>Domain</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_$X_DC_misc}" type="number" value="0" name="attr_DC_misc" placeholder="DC Mod" /> <br>DC Mod</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-6-spells_$X_school}" type="text" value="" name="attr_school" placeholder="Spell School [descriptor]" accept="School"><br>School</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-6-spells_$X_cast-time}" type="text" value="" name="attr_cast-time" placeholder="Casting Time" accept="Casting Time"/><br>Casting Time</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-6-spells_$X_isDomain}" type="checkbox" value="1" name="attr_isDomain" /><br>Domain</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-6-spells_$X_DC_misc}" type="number" value="0" name="attr_DC_misc" placeholder="DC Mod" /> <br>DC Mod</span>
 								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_$X_savedc}" type="number" value="0" name="attr_savedc" class="sheet-calc" readonly="readonly" /> <br>DC</span>			
+								<div></div>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-6-spells_$X_components}" type="text" value="" name="attr_components" placeholder="Components" accept="Components"><br>Components</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-6-spells_$X_range}" type="text" value="" name="attr_range" placeholder="Range" accept="Range"><br>Range</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-6-spells_$X_range_numeric}" type="number" value="0" name="attr_range_numeric" placeholder="0" class="sheet-calc" readonly="readonly"><br>Range</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label sheet-sect">
+                                    <input title="@{repeating_lvl-6-spells_$X_targets}" type="text" value="" name="attr_targets" placeholder="Targets/Area/Effect" accept="Target">
+									<input type="hidden" value="" name="attr_targets" accept="Area">
+									<input type="hidden" value="" name="attr_targets" accept="Effect">
+									<br>Targets/Area/Effect
+								</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-6-spells_$X_duration}" type="text" value="" name="attr_duration" placeholder="Duration" accept="Duration"/><br>Duration</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-6-spells_$X_save}" type="text" value="" name="attr_save" placeholder="Save Effect" accept="Saving Throw"><br>Save Effect</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect">
+									<select title="@{repeating_lvl-6-spells_$X_sr}" name="attr_sr" accept="Spell Resistance">
+										<option value="" selected>&#8226;N/A</option>
+										<option value="Yes">Yes</option>
+										<option value="No">No</option>
+										<option value="Yes (Harmless)">Yes (Harmless)</option>
+										<option value="No (Harmless)">No (Harmless)</option>
+									</select>
+									<br>SR
+								</span>									
 								<div class="sheet-sect sheet-expand">
-									<div class="sheet-table">
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_$X_components}" type="text" value="" name="attr_components" placeholder="Components" accept="Components"><br>Components</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_$X_range}" type="text" value="" name="attr_range" placeholder="Range" accept="Range"><br>Range</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_$X_range_numeric}" type="number" value="0" name="attr_range_numeric" placeholder="0" class="sheet-calc" readonly="readonly"><br>Range</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label">
-                                            <input title="@{repeating_lvl-6-spells_$X_targets}" type="text" value="" name="attr_targets" placeholder="Targets/Area/Effect" accept="Target">
-											<input type="hidden" value="" name="attr_targets" accept="Area">
-											<input type="hidden" value="" name="attr_targets" accept="Effect">
-											<br>Targets/Area/Effect
-										</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_$X_duration}" type="text" value="" name="attr_duration" placeholder="Duration" accept="Duration"/><br>Duration</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-6-spells_$X_save}" type="text" value="" name="attr_save" placeholder="Save Effect" accept="Saving Throw"><br>Save Effect</span>
-										<span class="sheet-table-data sheet-center sheet-small-label">
-											<select title="@{repeating_lvl-6-spells_$X_sr}" name="attr_sr" accept="Spell Resistance">
-												<option value="" selected>&#8226;N/A</option>
-												<option value="Yes">Yes</option>
-												<option value="No">No</option>
-												<option value="Yes (Harmless)">Yes (Harmless)</option>
-												<option value="No (Harmless)">No (Harmless)</option>
-											</select>
-											<br>SR
-										</span>
-									</div>
 									<b>Misc</b>
                                     <input type="checkbox" class="sheet-spell-misc-show" title="@{repeating_lvl-6-spells_$X_spell-misc-show}" name="attr_spell-misc-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;" checked="checked" /><span></span>
 									<b>Description</b>
@@ -8902,35 +8905,34 @@
 								<br>Class
 								</span>
 								<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-7-spells_$X_spell_level}" type="number" value="7" name="attr_spell_level" /><br>Level</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_$X_school}" type="text" value="" name="attr_school" placeholder="Spell School [descriptor]" accept="School"><br>School</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_$X_cast-time}" type="text" value="" name="attr_cast-time" placeholder="Casting Time" accept="Casting Time"/><br>Casting Time</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_$X_isDomain}" type="checkbox" value="1" name="attr_isDomain" /><br>Domain</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_$X_DC_misc}" type="number" value="0" name="attr_DC_misc" placeholder="DC Mod" /> <br>DC Mod</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-7-spells_$X_school}" type="text" value="" name="attr_school" placeholder="Spell School [descriptor]" accept="School"><br>School</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-7-spells_$X_cast-time}" type="text" value="" name="attr_cast-time" placeholder="Casting Time" accept="Casting Time"/><br>Casting Time</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-7-spells_$X_isDomain}" type="checkbox" value="1" name="attr_isDomain" /><br>Domain</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-7-spells_$X_DC_misc}" type="number" value="0" name="attr_DC_misc" placeholder="DC Mod" /> <br>DC Mod</span>
 								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_$X_savedc}" type="number" value="0" name="attr_savedc" class="sheet-calc" readonly="readonly" /> <br>DC</span>			
-								<div class="sheet-sect sheet-expand">
-									<div class="sheet-table">
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_$X_components}" type="text" value="" name="attr_components" placeholder="Components" accept="Components"><br>Components</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_$X_range}" type="text" value="" name="attr_range" placeholder="Range" accept="Range"><br>Range</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_$X_range_numeric}" type="number" value="0" name="attr_range_numeric" placeholder="0" class="sheet-calc" readonly="readonly"><br>Range</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label">
-                                            <input title="@{repeating_lvl-7-spells_$X_targets}" type="text" value="" name="attr_targets" placeholder="Targets/Area/Effect" accept="Target">
-											<input type="hidden" value="" name="attr_targets" accept="Area">
-											<input type="hidden" value="" name="attr_targets" accept="Effect">
-											<br>Targets/Area/Effect
-										</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_$X_duration}" type="text" value="" name="attr_duration" placeholder="Duration" accept="Duration"/><br>Duration</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-7-spells_$X_save}" type="text" value="" name="attr_save" placeholder="Save Effect" accept="Saving Throw"><br>Save Effect</span>
-										<span class="sheet-table-data sheet-center sheet-small-label">
-											<select title="@{repeating_lvl-7-spells_$X_sr}" name="attr_sr" accept="Spell Resistance">
-												<option value="" selected>&#8226;N/A</option>
-												<option value="Yes">Yes</option>
-												<option value="No">No</option>
-												<option value="Yes (Harmless)">Yes (Harmless)</option>
-												<option value="No (Harmless)">No (Harmless)</option>
-											</select>
-											<br>SR
-										</span>
-									</div>
+								<div></div>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-7-spells_$X_components}" type="text" value="" name="attr_components" placeholder="Components" accept="Components"><br>Components</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-7-spells_$X_range}" type="text" value="" name="attr_range" placeholder="Range" accept="Range"><br>Range</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-7-spells_$X_range_numeric}" type="number" value="0" name="attr_range_numeric" placeholder="0" class="sheet-calc" readonly="readonly"><br>Range</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label sheet-sect">
+                                    <input title="@{repeating_lvl-7-spells_$X_targets}" type="text" value="" name="attr_targets" placeholder="Targets/Area/Effect" accept="Target">
+									<input type="hidden" value="" name="attr_targets" accept="Area">
+									<input type="hidden" value="" name="attr_targets" accept="Effect">
+									<br>Targets/Area/Effect
+								</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-7-spells_$X_duration}" type="text" value="" name="attr_duration" placeholder="Duration" accept="Duration"/><br>Duration</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-7-spells_$X_save}" type="text" value="" name="attr_save" placeholder="Save Effect" accept="Saving Throw"><br>Save Effect</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect">
+									<select title="@{repeating_lvl-7-spells_$X_sr}" name="attr_sr" accept="Spell Resistance">
+										<option value="" selected>&#8226;N/A</option>
+										<option value="Yes">Yes</option>
+										<option value="No">No</option>
+										<option value="Yes (Harmless)">Yes (Harmless)</option>
+										<option value="No (Harmless)">No (Harmless)</option>
+									</select>
+									<br>SR
+								</span>									
+								<div class="sheet-sect sheet-expand">	
 									<b>Misc</b>
                                     <input type="checkbox" class="sheet-spell-misc-show" title="@{repeating_lvl-7-spells_$X_spell-misc-show}" name="attr_spell-misc-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;" checked="checked" /><span></span>
 									<b>Description</b>
@@ -9054,35 +9056,34 @@
 								<br>Class
 								</span>
 								<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-8-spells_$X_spell_level}" type="number" value="8" name="attr_spell_level" /><br>Level</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_$X_school}" type="text" value="" name="attr_school" placeholder="Spell School [descriptor]" accept="School"><br>School</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_$X_cast-time}" type="text" value="" name="attr_cast-time" placeholder="Casting Time" accept="Casting Time"/><br>Casting Time</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_$X_isDomain}" type="checkbox" value="1" name="attr_isDomain" /><br>Domain</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_$X_DC_misc}" type="number" value="0" name="attr_DC_misc" placeholder="DC Mod" /> <br>DC Mod</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-8-spells_$X_school}" type="text" value="" name="attr_school" placeholder="Spell School [descriptor]" accept="School"><br>School</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-8-spells_$X_cast-time}" type="text" value="" name="attr_cast-time" placeholder="Casting Time" accept="Casting Time"/><br>Casting Time</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-8-spells_$X_isDomain}" type="checkbox" value="1" name="attr_isDomain" /><br>Domain</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-8-spells_$X_DC_misc}" type="number" value="0" name="attr_DC_misc" placeholder="DC Mod" /> <br>DC Mod</span>
 								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_$X_savedc}" type="number" value="0" name="attr_savedc" class="sheet-calc" readonly="readonly" /> <br>DC</span>			
+								<div></div>								
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-8-spells_$X_components}" type="text" value="" name="attr_components" placeholder="Components" accept="Components"><br>Components</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-8-spells_$X_range}" type="text" value="" name="attr_range" placeholder="Range" accept="Range"><br>Range</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-8-spells_$X_range_numeric}" type="number" value="0" name="attr_range_numeric" placeholder="0" class="sheet-calc" readonly="readonly"><br>Range</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label sheet-sect">
+                                    <input title="@{repeating_lvl-8-spells_$X_targets}" type="text" value="" name="attr_targets" placeholder="Targets/Area/Effect" accept="Target">
+									<input type="hidden" value="" name="attr_targets" accept="Area">
+									<input type="hidden" value="" name="attr_targets" accept="Effect">
+									<br>Targets/Area/Effect
+								</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-8-spells_$X_duration}" type="text" value="" name="attr_duration" placeholder="Duration" accept="Duration"/><br>Duration</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-8-spells_$X_save}" type="text" value="" name="attr_save" placeholder="Save Effect" accept="Saving Throw"><br>Save Effect</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect">
+									<select title="@{repeating_lvl-8-spells_$X_sr}" name="attr_sr" accept="Spell Resistance">
+										<option value="" selected>&#8226;N/A</option>
+										<option value="Yes">Yes</option>
+										<option value="No">No</option>
+										<option value="Yes (Harmless)">Yes (Harmless)</option>
+										<option value="No (Harmless)">No (Harmless)</option>
+									</select>
+									<br>SR
+								</span>
 								<div class="sheet-sect sheet-expand">
-									<div class="sheet-table">
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_$X_components}" type="text" value="" name="attr_components" placeholder="Components" accept="Components"><br>Components</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_$X_range}" type="text" value="" name="attr_range" placeholder="Range" accept="Range"><br>Range</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_$X_range_numeric}" type="number" value="0" name="attr_range_numeric" placeholder="0" class="sheet-calc" readonly="readonly"><br>Range</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label">
-                                            <input title="@{repeating_lvl-8-spells_$X_targets}" type="text" value="" name="attr_targets" placeholder="Targets/Area/Effect" accept="Target">
-											<input type="hidden" value="" name="attr_targets" accept="Area">
-											<input type="hidden" value="" name="attr_targets" accept="Effect">
-											<br>Targets/Area/Effect
-										</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_$X_duration}" type="text" value="" name="attr_duration" placeholder="Duration" accept="Duration"/><br>Duration</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-8-spells_$X_save}" type="text" value="" name="attr_save" placeholder="Save Effect" accept="Saving Throw"><br>Save Effect</span>
-										<span class="sheet-table-data sheet-center sheet-small-label">
-											<select title="@{repeating_lvl-8-spells_$X_sr}" name="attr_sr" accept="Spell Resistance">
-												<option value="" selected>&#8226;N/A</option>
-												<option value="Yes">Yes</option>
-												<option value="No">No</option>
-												<option value="Yes (Harmless)">Yes (Harmless)</option>
-												<option value="No (Harmless)">No (Harmless)</option>
-											</select>
-											<br>SR
-										</span>
-									</div>
 									<b>Misc</b>
                                     <input type="checkbox" class="sheet-spell-misc-show" title="@{repeating_lvl-8-spells_$X_spell-misc-show}" name="attr_spell-misc-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;" checked="checked" /><span></span>
 									<b>Description</b>
@@ -9206,35 +9207,34 @@
 								<br>Class
 								</span>
 								<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_lvl-9-spells_$X_spell_level}" type="number" value="9" name="attr_spell_level" /><br>Level</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_$X_school}" type="text" value="" name="attr_school" placeholder="Spell School [descriptor]" accept="School"><br>School</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_$X_cast-time}" type="text" value="" name="attr_cast-time" placeholder="Casting Time" accept="Casting Time"/><br>Casting Time</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_$X_isDomain}" type="checkbox" value="1" name="attr_isDomain" /><br>Domain</span>
-								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_$X_DC_misc}" type="number" value="0" name="attr_DC_misc" placeholder="DC Mod" /> <br>DC Mod</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-9-spells_$X_school}" type="text" value="" name="attr_school" placeholder="Spell School [descriptor]" accept="School"><br>School</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-9-spells_$X_cast-time}" type="text" value="" name="attr_cast-time" placeholder="Casting Time" accept="Casting Time"/><br>Casting Time</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-9-spells_$X_isDomain}" type="checkbox" value="1" name="attr_isDomain" /><br>Domain</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-9-spells_$X_DC_misc}" type="number" value="0" name="attr_DC_misc" placeholder="DC Mod" /> <br>DC Mod</span>
 								<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_$X_savedc}" type="number" value="0" name="attr_savedc" class="sheet-calc" readonly="readonly" /> <br>DC</span>			
+								<div></div>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-9-spells_$X_components}" type="text" value="" name="attr_components" placeholder="Components" accept="Components"><br>Components</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-9-spells_$X_range}" type="text" value="" name="attr_range" placeholder="Range" accept="Range"><br>Range</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-9-spells_$X_range_numeric}" type="number" value="0" name="attr_range_numeric" placeholder="0" class="sheet-calc" readonly="readonly"><br>Range</span>
+                                <span class="sheet-table-data sheet-center sheet-small-label sheet-sect">
+                                    <input title="@{repeating_lvl-9-spells_$X_targets}" type="text" value="" name="attr_targets" placeholder="Targets/Area/Effect" accept="Target">
+									<input type="hidden" value="" name="attr_targets" accept="Area">
+									<input type="hidden" value="" name="attr_targets" accept="Effect">
+									<br>Targets/Area/Effect
+								</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-9-spells_$X_duration}" type="text" value="" name="attr_duration" placeholder="Duration" accept="Duration"/><br>Duration</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_lvl-9-spells_$X_save}" type="text" value="" name="attr_save" placeholder="Save Effect" accept="Saving Throw"><br>Save Effect</span>
+								<span class="sheet-table-data sheet-center sheet-small-label sheet-sect">
+									<select title="@{repeating_lvl-9-spells_$X_sr}" name="attr_sr" accept="Spell Resistance">
+										<option value="" selected>&#8226;N/A</option>
+										<option value="Yes">Yes</option>
+										<option value="No">No</option>
+										<option value="Yes (Harmless)">Yes (Harmless)</option>
+										<option value="No (Harmless)">No (Harmless)</option>
+									</select>
+								<br>SR
+								</span>									
 								<div class="sheet-sect sheet-expand">
-									<div class="sheet-table">
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_$X_components}" type="text" value="" name="attr_components" placeholder="Components" accept="Components"><br>Components</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_$X_range}" type="text" value="" name="attr_range" placeholder="Range" accept="Range"><br>Range</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_$X_range_numeric}" type="number" value="0" name="attr_range_numeric" placeholder="0" class="sheet-calc" readonly="readonly"><br>Range</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label">
-                                            <input title="@{repeating_lvl-9-spells_$X_targets}" type="text" value="" name="attr_targets" placeholder="Targets/Area/Effect" accept="Target">
-											<input type="hidden" value="" name="attr_targets" accept="Area">
-											<input type="hidden" value="" name="attr_targets" accept="Effect">
-											<br>Targets/Area/Effect
-										</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_$X_duration}" type="text" value="" name="attr_duration" placeholder="Duration" accept="Duration"/><br>Duration</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_lvl-9-spells_$X_save}" type="text" value="" name="attr_save" placeholder="Save Effect" accept="Saving Throw"><br>Save Effect</span>
-										<span class="sheet-table-data sheet-center sheet-small-label">
-											<select title="@{repeating_lvl-9-spells_$X_sr}" name="attr_sr" accept="Spell Resistance">
-												<option value="" selected>&#8226;N/A</option>
-												<option value="Yes">Yes</option>
-												<option value="No">No</option>
-												<option value="Yes (Harmless)">Yes (Harmless)</option>
-												<option value="No (Harmless)">No (Harmless)</option>
-											</select>
-											<br>SR
-										</span>
-									</div>
 									<b>Misc</b>
                                     <input type="checkbox" class="sheet-spell-misc-show" title="@{repeating_lvl-9-spells_$X_spell-misc-show}" name="attr_spell-misc-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;" checked="checked" /><span></span>
 									<b>Description</b>
@@ -9415,12 +9415,12 @@
                         <input type="checkbox" class="sheet-counted sheet-sect-show" title="@{repeating_racial-trait_$X_racial-trait-show}" name="attr_racial-trait-show" value="1" checked="checked" />
                         <span class="sheet-table-data sheet-center"></span>
                         <span class="sheet-table-data sheet-center sheet-repeating-rollbutton"><button type="roll" name="attr_roll" title="%{selected|repeating_racial-trait_$X_roll}" value="@{macro-text}"></button></span>
-                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:24%;"><input title="@{repeating_racial-trait_$X_name}" type="text" name="attr_name" placeholder="Racial Trait Name" accept="Name"><br>Name</span>
-                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:40%;"><input title="@{repeating_racial-trait_$X_short-description}" type="text" name="attr_short-description" placeholder="Short Description"><br>Short Desc</span>
-                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:4%;"><input title="@{repeating_racial-trait_$X_used}" type="number" name="attr_used" value="0" /><br>Uses</span>
-						<span class="sheet-table-data sheet-divider-lg" >/</span>
-                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:4%;"><input title="@{repeating_racial-trait_$X_used|max" type="number" name="attr_used_max" value="" class="sheet-calc" readonly="readonly" /><br>Max</span>
-                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><input title="@{repeating_racial-trait_$X_max-calculation}" type="text" name="attr_max-calculation" value="" Placeholder="macro" /><br>Max Calc</span>
+                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input title="@{repeating_racial-trait_$X_name}" type="text" name="attr_name" placeholder="Racial Trait Name" accept="Name"><br>Name</span>
+                        <span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:30%;"><input title="@{repeating_racial-trait_$X_short-description}" type="text" name="attr_short-description" placeholder="Short Description"><br>Short Desc</span>
+                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:.1%;"><input title="@{repeating_racial-trait_$X_used}" type="number" name="attr_used" value="0" /><br>Uses</span>
+						<span class="sheet-table-data sheet-divider-lg" style="width:.1%;">/</span>
+                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:.1%;"><input title="@{repeating_racial-trait_$X_used|max" type="number" name="attr_used_max" value="" class="sheet-calc" readonly="readonly" /><br>Max</span>
+                        <span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:15%;"><input title="@{repeating_racial-trait_$X_max-calculation}" type="text" name="attr_max-calculation" value="" Placeholder="macro" /><br>Max Calc</span>
 						<div class="sheet-sect sheet-expand">
 							<b>Description</b>
 							<input type="checkbox" class="sheet-desc-show" title="@{repeating_racial-trait_$X_description-show}" name="attr_description-show" value="1" style="opacity:0; width:90px; height:1.5em; position:relative; top:0; left:0; margin:0 -15px 0 -75px; cursor:pointer; z-index:1;" checked="checked" /><span></span>
@@ -9460,11 +9460,11 @@
                         <span class="sheet-table-data sheet-center"></span>
                         <span class="sheet-table-data sheet-center sheet-repeating-rollbutton"><button type="roll" name="attr_roll" title="%{selected|repeating_trait_$X_roll}" value="@{macro-text}"></button></span>
                         <span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input title="@{repeating_trait_$X_name}" type="text" name="attr_name" placeholder="Trait Name" accept="Name"><br>Name</span>
-                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:57%;"><input title="@{repeating_trait_$X_short-description}" type="text" name="attr_short-description" placeholder="Short Description"><br>Short Desc</span>
-                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_trait_$X_used}" type="number" name="attr_used" value="0" /><br>Uses</span>
-						<span class="sheet-table-data sheet-divider-lg" >/</span>
-                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_trait_$X_used|max" type="number" name="attr_used_max" value="0" class="sheet-calc" readonly="readonly" /><br>Max</span>
-                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input title="@{repeating_trait_$X_max-calculation}" type="text" name="attr_max-calculation" value="" Placeholder="macro" /><br>Max Calc</span>
+                        <span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:30%;"><input title="@{repeating_trait_$X_short-description}" type="text" name="attr_short-description" placeholder="Short Description"><br>Short Desc</span>
+                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:.1%;"><input title="@{repeating_trait_$X_used}" type="number" name="attr_used" value="0" /><br>Uses</span>
+						<span class="sheet-table-data sheet-divider-lg" style="width:.1%;">/</span>
+                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:.1%;"><input title="@{repeating_trait_$X_used|max" type="number" name="attr_used_max" value="0" class="sheet-calc" readonly="readonly" /><br>Max</span>
+                        <span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:15%;"><input title="@{repeating_trait_$X_max-calculation}" type="text" name="attr_max-calculation" value="" Placeholder="macro" /><br>Max Calc</span>
 						<div class="sheet-sect sheet-expand">	
 							<b>Description</b>
 							<input type="checkbox" class="sheet-desc-show" title="@{repeating_trait_$X_description-show}" name="attr_description-show" value="1" style="opacity:0; width:90px; height:1.5em; position:relative; top:0; left:0; margin:0 -15px 0 -75px; cursor:pointer; z-index:1;" checked="checked" /><span></span>
@@ -9811,19 +9811,23 @@
                 <div class="sheet-repeating-sect">
 				<b>Attacks</b>
                     <input type="checkbox" class="sheet-sect-show" title="@{attacks-show}" name="attr_attacks-show" value="1" style="width:70px; margin:0 -15px 0 -55px;" checked="checked" /><span></span>
-                    <input type="checkbox" class="sheet-sect sheet-expand-show" title="Collapse or expand all rows." name="attr_class-expand-show" value="1" style="opacity: 0;height: 1.5em;width: 20px; margin: 0px -22px 2px 0; z-index: 1;cursor: help;" /><span class="sheet-sect"></span>
-                    <input type="checkbox" class="sheet-sect sheet-split-column-show" value="1" name="attr_repeating-weapon-column-show" title="Two or one column rows" /><span class="sheet-sect"></span>		<div class="sheet-sect">
+        <input type="checkbox" class="sheet-sect sheet-expand-show" title="Collapse or expand all rows." name="attr_attacks-expand-show" value="1" style="opacity: 0;height: 1.5em;width: 20px; margin: 0px -22px 2px 0; z-index: 1;cursor: help;" /><span class="sheet-sect"></span>
+        <input type="checkbox" class="sheet-sect sheet-split-column-show" value="1" name="attr_weapon-column-show" title="Two or one column rows" /><span class="sheet-sect"></span>
+		<div class="sheet-table sheet-sect">
+			<span class="sheet-table-name">Attacks</span>
+		</div>
+		<div class="sheet-sect">
 					<div class="sheet-repeating-fields">
 						<fieldset class="repeating_weapon">
                                 <input type="checkbox" class="sheet-counted sheet-sect-show" name="attr_attack-show" title="@{repeating_weapon_$X_attack-show}" value="1" checked="checked" />
                                 <span class="sheet-table-data sheet-center"></span>
                                 <span class="sheet-table-data sheet-center sheet-repeating-rollbutton"><button type="roll" name="attr_attack-npc-roll" title="%{selected|repeating_weapon_$X_attack-npc-roll}" value="@{NPC-macro-text}"></button></span>
-							<span class="sheet-table-data sheet-center sheet-small-label"><input type="number"  name="attr_enhance" title="@{repeating_weapon_$X_enhance}" value="0" style="width:40px;"  /><br>Enh</span>
-							<span class="sheet-table-data sheet-center sheet-small-label" style="padding-top: 8px;"><input type="checkbox" name="attr_masterwork" title="@{repeating_weapon_$X_masterwork}" value="1" style="width:15px;height:15px;" /><br>Mwk</span>
+							<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input type="number"  name="attr_enhance" title="@{repeating_weapon_$X_enhance}" value="0" style="width:40px;"  /><br>Enh</span>
+							<span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="padding-top: 8px;"><input type="checkbox" name="attr_masterwork" title="@{repeating_weapon_$X_masterwork}" value="1" style="width:15px;height:15px;" /><br>Mwk</span>
 							<span class="sheet-table-data sheet-center sheet-small-label"><input type="text" name="attr_name" title="@{repeating_weapon_$X_name}" placeholder="Name" /><br>Name</span>
 							<span class="sheet-table-data sheet-center sheet-small-label" style="width:8%;"><input type="text" name="attr_attack" title="@{repeating_weapon_$X_attack}" placeholder="Attack Modifiers" /><br>ATK&nbsp;Mods</span>
-							<span class="sheet-table-data sheet-center sheet-small-label" style="width:8%;"><input type="number" name="attr_attack-mod" title="@{repeating_weapon_$X_attack-mod}" value="0" style="width:40px;" class="sheet-calc" readonly="readonly" /><br>val</span>
-							<span class="sheet-table-data sheet-divider">+</span>
+					<span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:8%;"><input type="number" name="attr_attack-mod" title="@{repeating_weapon_$X_attack-mod}" value="0" style="width:40px;" class="sheet-calc" readonly="readonly" /><br>val</span>
+					<span class="sheet-table-data sheet-divider sheet-sect">+</span>
 							<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;">
 								<select title="@{repeating_weapon_$X_attack-type}" name="attr_attack-type">
 									<option value="0" selected>&#8226;None</option>
@@ -9833,31 +9837,29 @@
 								</select>
 								<br>ATK Type
 							</span>
-							<span class="sheet-table-data sheet-center sheet-small-label"><input type="number" name="attr_attack-type-mod" title="@{repeating_weapon_$X_attack-type-mod}" value="0" style="width:40px;" class="sheet-calc" readonly="readonly" /><br>mod</span>
-							<span class="sheet-table-data sheet-divider">+</span>
-							<span class="sheet-table-data sheet-center sheet-small-label"><input type="number" name="attr_attk-effect-total-copy" title="@{repeating_weapon_$X_attk-effect-total-copy}" value="0" style="width:40px;" class="sheet-calc" readonly="readonly"  /><br><b title="Additional modifier from Attack and Damage Effects.">Other</b></span>
-							<span class="sheet-table-data sheet-divider">=</span>
+					<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input type="number" name="attr_attack-type-mod" title="@{repeating_weapon_$X_attack-type-mod}" value="0" style="width:40px;" class="sheet-calc" readonly="readonly" /><br>mod</span>
+					<span class="sheet-table-data sheet-divider sheet-sect">+</span>
+					<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input type="number" name="attr_attk-effect-total-copy" title="@{repeating_weapon_$X_attk-effect-total-copy}" value="0" style="width:40px;" class="sheet-calc" readonly="readonly"  /><br><b title="Additional modifier from Attack and Damage Effects.">Other</b></span>
+					<span class="sheet-table-data sheet-divider sheet-sect">=</span>
 							<span class="sheet-table-data sheet-center sheet-small-label"><input type="number" name="attr_total-attack" title="@{repeating_weapon_$X_total-attack}" value="0" style="width:3.5em;" class="sheet-calc" readonly="readonly" /><br>ATK</span>
-                            <span class="sheet-table-data sheet-center sheet-small-label"><input type="number" name="attr_crit-target" title="@{repeating_weapon_$X_crit-target}" style="width:40px;" value="20" min="0" max="20" /><br>Crit</span>
-							<span class="sheet-table-data sheet-divider-lg" style="padding-bottom:10px;"><b>/x</b></span>
-							<span class="sheet-table-data sheet-center sheet-small-label"><input type="number" name="attr_crit-multiplier" title="@{repeating_weapon_$X_crit-multiplier}" style="width:40px;" value="2" min="0" /><br>Mult</span>
-							<span class="sheet-table-data sheet-center sheet-small-label">
+                    <span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input type="number" name="attr_crit-target" title="@{repeating_weapon_$X_crit-target}" style="width:40px;" value="20" min="0" max="20" /><br>Crit</span>
+					<span class="sheet-table-data sheet-divider-lg sheet-sect" style="padding-bottom:10px;"><b>/x</b></span>
+					<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input type="number" name="attr_crit-multiplier" title="@{repeating_weapon_$X_crit-multiplier}" style="width:40px;" value="2" min="0" /><br>Mult</span>
+					<span class="sheet-table-data sheet-center sheet-small-label sheet-sect">
 								<select title="@{repeating_weapon_$X_proficiency}" name="attr_proficiency">
 									<option value="0" selected>&#8226;Yes</option>
 									<option value="-4" >No</option>
 								</select>
 								<br>Proficiency
 							</span>
-							<div class="sheet-sect sheet-expand">
-								<div class="sheet-table">
-									<div class="sheet-table-row">
+					<div></div>	
 										<span class="sheet-table-data sheet-center sheet-small-label" ><input type="number" name="attr_damage-dice-num" title="@{repeating_weapon_$X_damage-dice-num}"  style="width:2.8em;" value="0" min="0" /><br>Dice</span>
 										<span class="sheet-table-data sheet-divider" style="padding-bottom: 10px;">d</span>
 										<span class="sheet-table-data sheet-center sheet-small-label" style="width:3em;" ><input type="number" name="attr_damage-die" title="@{repeating_weapon_$X_damage-die}" style="width:2.8em;" value="0" min="0" /><br>Die</span>
 										<span class="sheet-table-data sheet-divider">+</span>
 										<span class="sheet-table-data sheet-center sheet-small-label sheet-entry_med" ><input type="text" name="attr_damage" title="@{repeating_weapon_$X_damage}" placeholder="Damage Modifiers" /><br>DMG Mods</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"  ><input type="number" name="attr_damage-mod" title="@{repeating_weapon_$X_damage-mod}" value="0" style="width:2.4em;" class="sheet-calc" readonly="readonly" /><br>val</span>
-										<span class="sheet-table-data sheet-divider">+</span>
+					<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"  ><input type="number" name="attr_damage-mod" title="@{repeating_weapon_$X_damage-mod}" value="0" style="width:2.4em;" class="sheet-calc" readonly="readonly" /><br>val</span>
+					<span class="sheet-table-data sheet-divider sheet-sect">+</span>
 										<span class="sheet-table-data sheet-center sheet-small-label" style="width:8%;">
 									<select title="@{repeating_weapon_$X_damage-ability}" name="attr_damage-ability" style="font-size:1em;">
 										<option value="0 - [[ @{condition-sickened} ]]" selected>&#8226;None</option>
@@ -9888,29 +9890,26 @@
 									</select>
 									<br>DMG Ability
 								</span>
-										<span class="sheet-table-data sheet-center sheet-small-label" style="width:2em;" ><input style="width:2em;" type="text" name="attr_damage-ability-max" title="@{repeating_weapon_$X_damage-ability-max} for strength bows, etc." value="0" Placeholder="NA" /><br/>Max</span>
-										<span class="sheet-table-data sheet-center sheet-small-label" ><input type="number" name="attr_damage-ability-mod" title="@{repeating_weapon_$X_attr_damage-ability-mod}" value="0" style="width:2.4em;" class="sheet-calc" readonly="readonly" /><br/>Mod</span>
-										<span class="sheet-table-data sheet-divider">+</span>
-										<span class="sheet-table-data sheet-center"><span class="sheet-table-data sheet-center sheet-small-label" ><input type="number" name="attr_dmg-effect-total-copy" title="@{repeating_weapon_$X_dmg-effect-total-copy}" value="0" style="width:2.8em;" class="sheet-calc" readonly="readonly"  /><br><b title="Additional modifier from Attack and Damage Effects.">Other</b></span></span>
-										<span class="sheet-table-data sheet-divider">+</span>
-										<span class="sheet-table-data sheet-center"><span class="sheet-table-data sheet-center sheet-small-label" ><input type="number" name="attr_DMG-mod-copy" title="@{DMG-mod} buffs and conditions" value="0" style="width:2.8em;" class="sheet-calc" readonly="readonly" /><br>Adj</span></span>
-										<span class="sheet-table-data sheet-divider">=</span>
+					<span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:2em;" ><input style="width:2em;" type="text" name="attr_damage-ability-max" title="@{repeating_weapon_$X_damage-ability-max} for strength bows, etc." value="" Placeholder="NA" /><br/>Max</span>
+					<span class="sheet-table-data sheet-center sheet-small-label sheet-sect" ><input type="number" name="attr_damage-ability-mod" title="@{repeating_weapon_$X_attr_damage-ability-mod}" value="0" style="width:2.4em;" class="sheet-calc" readonly="readonly" /><br/>Mod</span>
+					<span class="sheet-table-data sheet-divider sheet-sect">+</span>
+					<span class="sheet-table-data sheet-center sheet-sect"><span class="sheet-table-data sheet-center sheet-small-label" ><input type="number" name="attr_dmg-effect-total-copy" title="@{repeating_weapon_$X_dmg-effect-total-copy}" value="0" style="width:2.8em;" class="sheet-calc" readonly="readonly"  /><br><b title="Additional modifier from Attack and Damage Effects.">Other</b></span></span>
+					<span class="sheet-table-data sheet-divider sheet-sect">+</span>
+					<span class="sheet-table-data sheet-center sheet-sect"><span class="sheet-table-data sheet-center sheet-small-label" ><input type="number" name="attr_DMG-mod-copy" title="@{DMG-mod} buffs and conditions" value="0" style="width:2.8em;" class="sheet-calc" readonly="readonly" /><br>Adj</span></span>
+					<span class="sheet-table-data sheet-divider sheet-sect">=</span>
 										<span class="sheet-table-data sheet-center sheet-small-label"><input type="number" name="attr_total-damage" title="@{repeating_weapon_$X_total-damage}" value="0" style="width:2.8em;" class="sheet-calc" readonly="readonly" /><br>DMG</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input type="number" name="attr_range" title="@{repeating_weapon_$X_range}" value="0"  min="0"style="width:3.8em;"  /><br>Range</span>
+					<span class="sheet-table-data sheet-center sheet-small-label"><input type="number" name="attr_range" title="@{repeating_weapon_$X_range}" value="0"  min="0" style="width:3.5em;"  /><br>Range</span>
 										<span class="sheet-table-data sheet-center sheet-small-label"><input type="text" name="attr_type" title="@{repeating_weapon_$X_type} Damage Type" placeholder="Damage Type" style="width:3em;"/><br>type</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input type="number" name="attr_weight" title="@{repeating_weapon_$X_weight}" value="0"  step="any" min="0" style="width:3em;" /><br>WT</span>
+					<span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input type="number" name="attr_weight" title="@{repeating_weapon_$X_weight}" value="0"  step="any" min="0" style="width:3em;" /><br>WT</span>
 										<span class="sheet-table-data sheet-center sheet-small-label"><input type="number" name="attr_ammo" title="@{repeating_weapon_$X_ammo}" value="0" style="width:2.8em;"  /><br>Ammo</span>
-									</div>
-								</div>
-								<div class="sheet-table">
-									<div class="sheet-table-row">
+					<div class="sheet-table sheet-sect">
 										<textarea class="sheet-weapon-notes" name="attr_notes" title="@{repeating_weapon_$X_notes}" placeholder="Weapon Notes"></textarea>
 										<span class="sheet-center sheet-small-label" style="display: block;">Notes</span>
 										<span class="sheet-table-data sheet-center sheet-small-label" style="width:5em;"><input type="number" name="attr_weapon-hardness" title="@{repeating_weapon_$X_weapon-hardness}" value="0"  step="any" min="0" style="width:3em;" /><br>Hardness</span>
 										<span class="sheet-table-data sheet-center sheet-small-label" style="width:4.5em;"><input type="number" name="attr_weapon-hp" title="@{repeating_weapon_$X_weapon-hp}" value="0" style="width:2.8em;" /><br>HP</span>
 										<span class="sheet-table-data sheet-center sheet-small-label" style="width:4.5em;"><input type="number" name="attr_weapon-hp_max" title="@{repeating_weapon_$X_weapon-hp|max}" value="0" style="width:2.8em;" /><br>Max HP</span>
 									</div>
-								</div>
+					<div class="sheet-sect sheet-expand">	
 								<b title="Add additional attacks for this weapon.">
                                     Iterative Attacks
                                 </b>
@@ -10108,14 +10107,14 @@
 							<span class="sheet-table-header">Misc</span>
 						</div>
 						<div class="sheet-table-row">
-                                <span class="sheet-table-data sheet-center"><button style="font-size:100%;" title="%{selected|NPC-Spell-Class-0-CL-Check}" type="roll" name="roll_NPC-Spell-Class-0-CL-Check" value="@{NPC-whisper} &{template:pf_generic} {{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_generic}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=CL Check}} {{Class=**@{spellclass-0-name} @{spellclass-0-level}**}} {{Check=[[ 1d20 + @{spellclass-0-level} + @{spellclass-0-level-misc} ]]}}">CL Check</button></span>
-                                <span class="sheet-table-data sheet-center"><input title="@{spellclass-0-level-total}" type="number" name="attr_spellclass-0-level-total" value="0" class="sheet-calc" readonly="readonly" /></span>
+                            <span class="sheet-table-data sheet-center"><button style="font-size:100%;" title="%{selected|NPC-Spell-Class-0-CL-Check}" type="roll" name="roll_NPC-Spell-Class-0-CL-Check" value="@{NPC-whisper} &{template:pf_generic} {{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_generic}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=CL Check}} {{Class=**@{spellclass-0-name} @{spellclass-0-level}**}} {{Check=[[ 1d20 + @{spellclass-0-level} + @{spellclass-0-level-misc} ]]}}">CL Check</button></span>
+                            <span class="sheet-table-data sheet-center"><input title="@{spellclass-0-level-total}" type="number" name="attr_spellclass-0-level-total" value="0" class="sheet-calc" readonly="readonly" /></span>
 							<span class="sheet-table-data sheet-divider">=</span>
 							<span class="sheet-table-data sheet-center"><input title="@{spellclass-0-level}" type="number" name="attr_spellclass-0-level" value="0" /></span>
 							<span class="sheet-table-data sheet-divider">+</span>
 							<span class="sheet-table-data sheet-center"><input title="@{spellclass-0-level-misc}" type="number" name="attr_spellclass-0-level-misc" value="0" /></span>
-                                <span class="sheet-table-data sheet-center"><button style="font-size:100%;" title="%{selected|NPC-Concentration-Check-0}" type="roll" name="roll_NPC-Concentration-Check-0" value="@{NPC-whisper} &{template:pf_generic} {{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_generic}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=Concentration Check}} {{Class=**@{spellclass-0-name} @{spellclass-0-level}**}} {{Check=[[ 1d20 + @{Concentration-0} ]]}}">Concentration</button></span>
-                                <span class="sheet-table-data sheet-center"><input title="@{Concentration-0}" type="number" name="attr_Concentration-0" value="0" class="sheet-calc" readonly="readonly" /></span>
+                            <span class="sheet-table-data sheet-center"><button style="font-size:100%;" title="%{selected|NPC-Concentration-Check-0}" type="roll" name="roll_NPC-Concentration-Check-0" value="@{NPC-whisper} &{template:pf_generic} {{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_generic}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=Concentration Check}} {{Class=**@{spellclass-0-name} @{spellclass-0-level}**}} {{Check=[[ 1d20 + @{Concentration-0} ]]}}">Concentration</button></span>
+                            <span class="sheet-table-data sheet-center"><input title="@{Concentration-0}" type="number" name="attr_Concentration-0" value="0" class="sheet-calc" readonly="readonly" /></span>
 							<span class="sheet-table-data sheet-divider">=</span>
 							<span class="sheet-table-data sheet-center">
 								<select title="@{Concentration-0-ability}" name="attr_Concentration-0-ability">
@@ -10142,26 +10141,26 @@
 						<div class="sheet-sect">
 							<div class="sheet-repeating-fields">
 								<fieldset class="repeating_npc-spell-like-abilities">
-                                        <input type="checkbox" class="sheet-counted sheet-sect-show" title="@{repeating_npc-spell-like-abilities_$X_spell-show}" name="attr_spell-show" value="1" checked="checked" />
-                                        <span class="sheet-table-data sheet-center"></span>
-                                        <span class="sheet-table-data sheet-center sheet-repeating-rollbutton"><button type="roll" name="attr_roll" title="%{selected|repeating_npc-spell-like-abilities_$X_roll}" value="@{macro-text}"></button></span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_npc-spell-like-abilities_$X_used}" type="number" name="attr_used" value="0" /><br>Uses/Day</span>
-										<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><input title="@{repeating_npc-spell-like-abilities_$X_name}" type="text" name="attr_name" placeholder="Name" /><br>Name</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:25%;"><input title="@{repeating_npc-spell-like-abilities_$X_short-description}" type="text" name="attr_short-description" placeholder="Short Description" /><br>Short Desc</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_npc-spell-like-abilities_$X_level}" type="text" name="attr_level" value="0" placeholder="Spell Level" /><br>Level</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_npc-spell-like-abilities_$X_range}" type="text" name="attr_range" value="" placeholder="Range" /><br>Range</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_npc-spell-like-abilities_$X_duration}" type="text" name="attr_duration" value="" placeholder="Duration" /><br>Duration</span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_npc-spell-like-abilities_$X_save}" type="text" name="attr_save" value="" placeholder="Save" /><br>Save</span>
-										<span class="sheet-table-data sheet-center sheet-small-label" style="width:5.5em;">
-											<select title="@{repeating_npc-spell-like-abilities_$X_sr}" name="attr_sr">
-												<option value="" selected>&#8226;Select SR</option>
-												<option value="Yes">Yes</option>
-												<option value="No">No</option>
-												<option value="Yes (Harmless)">Yes (Harmless)</option>
-												<option value="No (Harmless)">No (Harmless)</option>
-											</select>
-											<br>SR
-										</span>
+                                    <input type="checkbox" class="sheet-counted sheet-sect-show" title="@{repeating_npc-spell-like-abilities_$X_spell-show}" name="attr_spell-show" value="1" checked="checked" />
+                                    <span class="sheet-table-data sheet-center"></span>
+                                    <span class="sheet-table-data sheet-center sheet-repeating-rollbutton"><button type="roll" name="attr_roll" title="%{selected|repeating_npc-spell-like-abilities_$X_roll}" value="@{macro-text}"></button></span>
+									<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_npc-spell-like-abilities_$X_used}" type="number" name="attr_used" value="0" /><br>Uses/Day</span>
+									<span class="sheet-table-data sheet-center sheet-small-label" style="width:25%;"><input title="@{repeating_npc-spell-like-abilities_$X_name}" type="text" name="attr_name" placeholder="Name" /><br>Name</span>
+                                    <span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:25%;"><input title="@{repeating_npc-spell-like-abilities_$X_short-description}" type="text" name="attr_short-description" placeholder="Short Description" /><br>Short Desc</span>
+                                    <span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_npc-spell-like-abilities_$X_level}" type="text" name="attr_level" value="0" placeholder="Spell Level" /><br>Level</span>
+                                    <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_npc-spell-like-abilities_$X_range}" type="text" name="attr_range" value="" placeholder="Range" /><br>Range</span>
+                                    <span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_npc-spell-like-abilities_$X_duration}" type="text" name="attr_duration" value="" placeholder="Duration" /><br>Duration</span>
+									<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_npc-spell-like-abilities_$X_save}" type="text" name="attr_save" value="" placeholder="Save" /><br>Save</span>
+									<span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:5.5em;">
+										<select title="@{repeating_npc-spell-like-abilities_$X_sr}" name="attr_sr">
+											<option value="" selected>&#8226;Select SR</option>
+											<option value="Yes">Yes</option>
+											<option value="No">No</option>
+											<option value="Yes (Harmless)">Yes (Harmless)</option>
+											<option value="No (Harmless)">No (Harmless)</option>
+										</select>
+										<br>SR
+									</span>
 									<div class="sheet-sect sheet-expand">
 										<b>Macro Text</b>
 										<input type="checkbox" class="sheet-macro-text-show" title="@{repeating_npc-spells_$X_macro-text-show}" name="attr_macro-text-show" value="1" style="opacity:0; width:90px; height:1.5em; position:relative; top:0; left:0; margin:0 -15px 0 -75px; cursor:pointer; z-index:1;" /><span></span>
@@ -10242,17 +10241,17 @@
 						<div class="sheet-sect">
 							<div class="sheet-repeating-fields">
 								<fieldset class="repeating_npc-spells1">
-                                        <input type="checkbox" class="sheet-counted sheet-sect-show" title="@{repeating_npc-spells1_$X_spells1-show}" name="attr_spells1-show" value="1" checked="checked" />
-                                        <span class="sheet-table-data sheet-center"></span>
-                                        <span class="sheet-table-data sheet-center sheet-repeating-rollbutton"><button type="roll" name="attr_roll" title="%{selected|repeating_npc-spells1_$X_roll}" value="@{macro-text}"></button></span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_npc-spells1_$X_used}" type="number" name="attr_used" value="0" /><br>Uses/Day</span>
-										<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><input title="@{repeating_npc-spells1_$X_name}" type="text" name="attr_name" placeholder="Name" /><br>Name</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:25%;"><input title="@{repeating_npc-spells1_$X_short-description}" type="text" name="attr_short-description" placeholder="Short Description" /><br>Short Desc</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_npc-spells1_$X_level}" type="text" name="attr_level" value="" placeholder="Spell Level" /><br>Level</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_npc-spells1_$X_range}" type="text" name="attr_range" value="" placeholder="Range" /><br>Range</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_npc-spells1_$X_duration}" type="text" name="attr_duration" value="" placeholder="Duration" /><br>Duration</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_npc-spells1_$X_save}" type="text" name="attr_save" value="" placeholder="Save" /><br>Save</span>
-									<span class="sheet-table-data sheet-center sheet-small-label" style="width:5.5em;">
+                                    <input type="checkbox" class="sheet-counted sheet-sect-show" title="@{repeating_npc-spells1_$X_spells1-show}" name="attr_spells1-show" value="1" checked="checked" />
+                                    <span class="sheet-table-data sheet-center"></span>
+                                    <span class="sheet-table-data sheet-center sheet-repeating-rollbutton"><button type="roll" name="attr_roll" title="%{selected|repeating_npc-spells1_$X_roll}" value="@{macro-text}"></button></span>
+									<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_npc-spells1_$X_used}" type="number" name="attr_used" value="0" /><br>Uses/Day</span>
+									<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><input title="@{repeating_npc-spells1_$X_name}" type="text" name="attr_name" placeholder="Name" /><br>Name</span>
+                                    <span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:25%;"><input title="@{repeating_npc-spells1_$X_short-description}" type="text" name="attr_short-description" placeholder="Short Description" /><br>Short Desc</span>
+                                    <span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_npc-spells1_$X_level}" type="text" name="attr_level" value="" placeholder="Spell Level" /><br>Level</span>
+                                    <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_npc-spells1_$X_range}" type="text" name="attr_range" value="" placeholder="Range" /><br>Range</span>
+                                    <span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_npc-spells1_$X_duration}" type="text" name="attr_duration" value="" placeholder="Duration" /><br>Duration</span>
+                                    <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_npc-spells1_$X_save}" type="text" name="attr_save" value="" placeholder="Save" /><br>Save</span>
+									<span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:5.5em;">
 										<select title="@{repeating_npc-spells1_$X_sr}" name="attr_sr">
 											<option value="" selected>&#8226;Select SR</option>
 											<option value="Yes">Yes</option>
@@ -10260,7 +10259,7 @@
 											<option value="Yes (Harmless)">Yes (Harmless)</option>
 											<option value="No (Harmless)">No (Harmless)</option>
 										</select>
-										<br>SR
+									<br>SR
 									</span>
 									<div class="sheet-sect sheet-expand">
 										<b>Macro Text</b>
@@ -10340,17 +10339,17 @@
 						<div class="sheet-sect">
 							<div class="sheet-repeating-fields">
 								<fieldset class="repeating_npc-spells2">
-                                        <input type="checkbox" class="sheet-counted sheet-sect-show" title="@{repeating_npc-spells2_$X_spells2-show}" name="attr_spells2-show" value="1" checked="checked" />
-                                        <span class="sheet-table-data sheet-center"></span>
-                                        <span class="sheet-table-data sheet-center sheet-repeating-rollbutton"><button type="roll" name="attr_roll" title="%{selected|repeating_npc-spells2_$X_roll}" value="@{macro-text}"></button></span>
-										<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_npc-spells2_$X_used}" type="number" name="attr_used" value="0" /><br>Uses/Day</span>
-										<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><input title="@{repeating_npc-spells2_$X_name}" type="text" name="attr_name" placeholder="Name" /><br>Name</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:25%;"><input title="@{repeating_npc-spells2_$X_short-description}" type="text" name="attr_short-description" placeholder="Short Description" /><br>Short Desc</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_npc-spells2_$X_level}" type="text" name="attr_level" value="" placeholder="Spell Level" /><br>Level</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_npc-spells2_$X_range}" type="text" name="attr_range" value="" placeholder="Range" /><br>Range</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_npc-spells2_$X_duration}" type="text" name="attr_duration" value="" placeholder="Duration" /><br>Duration</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_npc-spells2_$X_save}" type="text" name="attr_save" value="" placeholder="Save" /><br>Save</span>
-										<span class="sheet-table-data sheet-center sheet-small-label" style="width:5.5em;">
+                                    <input type="checkbox" class="sheet-counted sheet-sect-show" title="@{repeating_npc-spells2_$X_spells2-show}" name="attr_spells2-show" value="1" checked="checked" />
+                                    <span class="sheet-table-data sheet-center"></span>
+                                    <span class="sheet-table-data sheet-center sheet-repeating-rollbutton"><button type="roll" name="attr_roll" title="%{selected|repeating_npc-spells2_$X_roll}" value="@{macro-text}"></button></span>
+									<span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_npc-spells2_$X_used}" type="number" name="attr_used" value="0" /><br>Uses/Day</span>
+									<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><input title="@{repeating_npc-spells2_$X_name}" type="text" name="attr_name" placeholder="Name" /><br>Name</span>
+                                    <span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:25%;"><input title="@{repeating_npc-spells2_$X_short-description}" type="text" name="attr_short-description" placeholder="Short Description" /><br>Short Desc</span>
+                                    <span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_npc-spells2_$X_level}" type="text" name="attr_level" value="" placeholder="Spell Level" /><br>Level</span>
+                                    <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_npc-spells2_$X_range}" type="text" name="attr_range" value="" placeholder="Range" /><br>Range</span>
+                                    <span class="sheet-table-data sheet-center sheet-small-label sheet-sect"><input title="@{repeating_npc-spells2_$X_duration}" type="text" name="attr_duration" value="" placeholder="Duration" /><br>Duration</span>
+                                    <span class="sheet-table-data sheet-center sheet-small-label"><input title="@{repeating_npc-spells2_$X_save}" type="text" name="attr_save" value="" placeholder="Save" /><br>Save</span>
+									<span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:5.5em;">
 										<select title="@{repeating_npc-spells2_$X_sr}" name="attr_sr">
 											<option value="" selected>&#8226;Select SR</option>
 											<option value="Yes">Yes</option>
@@ -10453,15 +10452,15 @@
 				<div class="sheet-table sheet-sect">
 					<div class="sheet-repeating-fields">
 						<fieldset class="repeating_feat">
-                                <input type="checkbox" class="sheet-counted sheet-sect-show" title="@{repeating_feat_$X_feat-show}" name="attr_feat-show" value="1" checked="checked" />
-                                <span class="sheet-table-data sheet-center"></span>
-                                <span class="sheet-table-data sheet-center sheet-repeating-rollbutton"><button type="roll" name="attr_npc-roll" title="%{selected|repeating_feat_$X_npc-roll" value="@{npc-macro-text}"></button></span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:32%;"><input title="@{repeating_feat_$X_name}" type="text" name="attr_name" placeholder="Feat Name"><br>Name</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:32%;"><textarea class="sheet-weapon-notes" title="@{repeating_feat_$X_short-description}" name="attr_short-description" placeholder="Short Desc"></textarea><br>Short Desc</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:4%;"><input title="@{repeating_feat_$X_used}" type="number" name="attr_used" value="0" /><br>Used</span>
-								<span class="sheet-table-data sheet-divider-lg" >/<br>&nbsp;</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:4%;"><input title="@{repeating_feat_$X_used|max" type="text" name="attr_used_max" value="0" class="sheet-calc" readonly="readonly" /><br>Max</span>
-                                <span class="sheet-table-data sheet-center sheet-small-label" style="width:16%;"><input title="@{repeating_feat_$X_max-calculation}" type="text" name="attr_max-calculation" value="" Placeholder="macro" /><br>Calc</span>
+                            <input type="checkbox" class="sheet-counted sheet-sect-show" title="@{repeating_feat_$X_feat-show}" name="attr_feat-show" value="1" checked="checked" />
+                            <span class="sheet-table-data sheet-center"></span>
+                            <span class="sheet-table-data sheet-center sheet-repeating-rollbutton"><button type="roll" name="attr_npc-roll" title="%{selected|repeating_feat_$X_npc-roll" value="@{npc-macro-text}"></button></span>
+                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:32%;"><input title="@{repeating_feat_$X_name}" type="text" name="attr_name" placeholder="Feat Name"><br>Name</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:32%;"><textarea class="sheet-weapon-notes" title="@{repeating_feat_$X_short-description}" name="attr_short-description" placeholder="Short Desc"></textarea><br>Short Desc</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:.1%;"><input title="@{repeating_feat_$X_used}" type="number" name="attr_used" value="0" /><br>Used</span>
+							<span class="sheet-table-data sheet-divider-lg" style="width:.1%;">/<br>&nbsp;</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label" style="width:.1%;"><input title="@{repeating_feat_$X_used|max" type="text" name="attr_used_max" value="0" class="sheet-calc" readonly="readonly" /><br>Max</span>
+                            <span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:15%;"><input title="@{repeating_feat_$X_max-calculation}" type="text" name="attr_max-calculation" value="" Placeholder="macro" /><br>Calc</span>
 							<div class="sheet-sect sheet-expand">
 								<b>Description</b>
 								<input type="checkbox" class="sheet-desc-show" title="@{repeating_feat_$X_description-show}" name="attr_description-show" value="1" style="opacity:0; width:90px; height:1.5em; position:relative; top:0; left:0; margin:0 -15px 0 -75px; cursor:pointer; z-index:1;" checked="checked" /><span></span>
@@ -10501,12 +10500,12 @@
                                         <input type="checkbox" class="sheet-counted sheet-sect-show" title="@{repeating_mythic-feat_$X_mythic-feat-show}" name="attr_mythic-feat-show" value="1" checked="checked" />
                                         <span class="sheet-table-data sheet-center"></span>
                                         <span class="sheet-table-data sheet-center sheet-repeating-rollbutton"><button type="roll" name="attr_npc-roll" title="%{selected|repeating_mythic-feat_$X_npc-roll" value="@{npc-macro-text}"></button></span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:24%;"><input title="@{repeating_mythic-feat_$X_name}" type="text" name="attr_name" placeholder="Mythic Feat Name"><br>Name</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:40%;"><input title="@{repeating_mythic-feat_$X_short-description}" type="text" name="attr_short-description" placeholder="Short Description"><br>Short Desc</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:4%;"><input title="@{repeating_mythic-feat_$X_used}" type="number" name="attr_used" value="0" /><br>Uses</span>
-                                        <span class="sheet-table-data sheet-divider-lg">/</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:4%;"><input title="@{repeating_mythic-feat_$X_used|max}" type="number" name="attr_used_max" value="0" class="sheet-calc" readonly="readonly" /><br>Max</span>
-                                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><input title="@{repeating_mythic-feat_$X_max-calculation}" type="text" name="attr_max-calculation" value="" Placeholder="macro" /><br>Max Calc</span>
+                                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:32%;"><input title="@{repeating_mythic-feat_$X_name}" type="text" name="attr_name" placeholder="Mythic Feat Name"><br>Name</span>
+                                        <span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:32%;"><input title="@{repeating_mythic-feat_$X_short-description}" type="text" name="attr_short-description" placeholder="Short Description"><br>Short Desc</span>
+                                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:.1%;"><input title="@{repeating_mythic-feat_$X_used}" type="number" name="attr_used" value="0" /><br>Uses</span>
+                                        <span class="sheet-table-data sheet-divider-lg" style="width:.1%;">/</span>
+                                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:.1%;"><input title="@{repeating_mythic-feat_$X_used|max}" type="number" name="attr_used_max" value="0" class="sheet-calc" readonly="readonly" /><br>Max</span>
+                                        <span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:15%;"><input title="@{repeating_mythic-feat_$X_max-calculation}" type="text" name="attr_max-calculation" value="" Placeholder="macro" /><br>Max Calc</span>
                                         <div class="sheet-sect sheet-expand">
                                             <b>Description</b>
                                             <input type="checkbox" class="sheet-desc-show" title="@{repeating_mythic-feat_$X_description-show}" name="attr_description-show" value="1" style="opacity:0; width:90px; height:1.5em; position:relative; top:0; left:0; margin:0 -15px 0 -75px; cursor:pointer; z-index:1;" checked="checked" /><span></span>
@@ -10883,12 +10882,12 @@
                         <input type="checkbox" class="sheet-counted sheet-sect-show" title="@{repeating_racial-trait_$X_racial-trait-show}" name="attr_racial-trait-show" value="1" checked="checked" />
                         <span class="sheet-table-data sheet-center"></span>
                         <span class="sheet-table-data sheet-center sheet-repeating-rollbutton"><button type="roll" name"attr_npc-roll" title="%{selected|repeating_racial-trait_$X_npc-roll}" value="@{npc-macro-text}"></button></span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:23%;"><input title="@{repeating_racial-trait_$X_name}" type="text" name="attr_name" placeholder="Special Ability Name" /><br>Name</span>
-                        <span class="sheet-table-data sheet-center sheet-small-label" style="width:45%;"><input title="@{repeating_racial-trait_$X_short-description}" type="text" name="attr_short-description" placeholder="Short Description" /><br>Short Desc</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_racial-trait_$X_used}" type="number" name="attr_used" value="0" /><br>Uses</span>
-						<span class="sheet-table-data sheet-divider-lg" >/<br>/</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input title="@{repeating_racial-trait_$X_used|max" type="number" name="attr_used_max" value="0"  class="sheet-calc" readonly="readonly" /><br>Max</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input title="@{repeating_racial-trait_$X_max-calculation}" type="text" name="attr_max-calculation" value="" Placeholder="macro" /><br>Max Calc</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:32%;"><input title="@{repeating_racial-trait_$X_name}" type="text" name="attr_name" placeholder="Special Ability Name" /><br>Name</span>
+                        <span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:32%;"><input title="@{repeating_racial-trait_$X_short-description}" type="text" name="attr_short-description" placeholder="Short Description" /><br>Short Desc</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:.1%;"><input title="@{repeating_racial-trait_$X_used}" type="number" name="attr_used" value="0" /><br>Uses</span>
+						<span class="sheet-table-data sheet-divider-lg" style="width:.1%;">/<br>/</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:.1%;"><input title="@{repeating_racial-trait_$X_used|max" type="number" name="attr_used_max" value="0"  class="sheet-calc" readonly="readonly" /><br>Max</span>
+						<span class="sheet-table-data sheet-center sheet-small-label sheet-sect" style="width:15%;"><input title="@{repeating_racial-trait_$X_max-calculation}" type="text" name="attr_max-calculation" value="" Placeholder="macro" /><br>Max Calc</span>
 					<div class="sheet-sect sheet-expand">
 						<b>Description</b>
 						<input type="checkbox" class="sheet-desc-show" title="@{repeating_racial-trait_$X_description-show}" name="attr_description-show" value="1" style="opacity:0; width:90px; height:1.5em; position:relative; top:0; left:0; margin:0 -15px 0 -75px; cursor:pointer; z-index:1;" checked="checked" /><span></span>
@@ -11020,6 +11019,7 @@
 		<div class="sheet-table sheet-sect">
 		<span class="sheet-table-name">Pathfinder Unchained</span>
 			<div class="sheet-table-row">
+				<input type="checkbox" class="sheet-sect-show" name="attr_unchained_skills-show" value="1" style="display:none;margin:-9999px;" /><span style="display:none;margin:-9999px;"></span>
 				<span class="sheet-table-data sheet-left">
                     <label>
                         <span title="Use the Unchained Skills variants.">
@@ -11032,10 +11032,10 @@
 						</span>
                     </label>
                 </span>
-				<span class="sheet-table-data sheet-left">	
+				<span class="sheet-table-data sheet-left sheet-sect">	
                     <label>
                         <span title="Consolidated skills ranks are awarded at 1/2 normal skill points.">
-                            <input type="radio" title="@{BG-Skill-Use}" name="attr_BG-Skill-Use" value="0" checked="checked" /> Enable Consolidated Skills.
+                            <input type="radio" title="@{BG-Skill-Use}" name="attr_BG-Skill-Use" value="0"  /> Enable Consolidated Skills.
                         </span>
                     </label>
                     <label>
@@ -11044,7 +11044,7 @@
 						</span>
                     </label>
                 </span>
-				<span class="sheet-table-data sheet-left">
+				<span class="sheet-table-data sheet-left sheet-sect">
                     <label><span title="Any number of adventure skill ranks can be traded for an equal number of background skill ranks."><input type="number" title="@{adventure-skills-traded}" name="attr_adventure-skills-traded" value="0" min="0" style="width:2.85em" /> Trade Adventure ranks for Background ranks.</span></label>
 				</span>
 			</div>
@@ -11226,7 +11226,7 @@
 <div class="sheet-footer">
 	<div class="sheet-table">
 		<div class="sheet-table-row">
-            <span class="sheet-table-data sheet-center">Created by Samuel Marino w/contributions by Vince, Chris Buchholz, Magik, James W. | Last updated: <i>03.20.16'&nbsp;&nbsp;</i>v.<input type="text" style="width:2.5em; height:1.4em; vertical-align:top; padding:0px 2px 0 2px; border:none;" name="attr_PFSheet_Version" value="0" class="sheet-calc" readonly="readonly" title="A non-blank version indicates attributes have been successfully recalculated."></span>
+            <span class="sheet-table-data sheet-center">Created by Samuel Marino w/contributions by Vince, Chris Buchholz, Magik, James W. | Last updated: <i>03.28.16'&nbsp;&nbsp;</i>v.<input type="text" style="width:2.5em; height:1.4em; vertical-align:top; padding:0px 2px 0 2px; border:none;" name="attr_PFSheet_Version" value="0" class="sheet-calc" readonly="readonly" title="A non-blank version indicates attributes have been successfully recalculated."></span>
 		</div>
 		<div class="sheet-table-row">
 			<span class="sheet-table-data sheet-center">Questions/Feedback?:<input type="text" style="width:75%; border:none; cursor:help; height:1.4em;" value="https://app.roll20.net/forum/post/2788628/pf-pathfinder-sheet-thread-5/?pageforid=2788628#post-2788628" /></span>
@@ -13327,7 +13327,8 @@ var ExExp = ExExp || (function () {
 
     handleExpression = function (msg) {
 		//replace spaces. replace "-" in front with "0-", replace "(-" with "(0-"
-		msg=msg.replace(/\s/g, '').replace(/^-/,'0-').replace(/\(-/g, '(0-' );
+		//also replace leading + with '', and replace (+  with (0+
+		msg=msg.replace(/\s/g, '').replace(/^-/,'0-').replace(/\(-/g, '(0-' ).replace(/^\+/,'').replace(/\(\+/g, '(0+' );
     	var chunks = []
             , asts = []
             , cmd = msg;
@@ -13700,42 +13701,42 @@ var SWUtils = SWUtils || (function () {
 
 
 var PFSheet = PFSheet || (function () {
-	'use strict';
+    'use strict';
 
-	var version = 0.42,
-	pfDebug = false,
+    var version = 0.43,
+    pfDebug = false,
 
-	/****************************** UTILITIES ************************************/
+    /****************************** UTILITIES ************************************/
 
     /* findAbilityInString
-	 * For dropdowns, this looks at the <option value="xxxx"> pass the value to here.
-	 *
+     * For dropdowns, this looks at the <option value="xxxx"> pass the value to here.
+     *
      * Looks at a string for instances of an ability modifier DEX-mod, STR-mod,  etc and returnsthe modifier it finds. 
      * Note the order checked is the same as the order they traditionally appear in: STR-mod,DEX-mod,CON-mod,INT-mod,WIS-mod,CHA-mod
-	* Also checks for regular abilities without mod, and other items that appear in dropdowns.
+    * Also checks for regular abilities without mod, and other items that appear in dropdowns.
      * if none is found, then if the first character is "0" return ""
      */
     findAbilityInString = function (fieldToFind) {
-    	if (!fieldToFind) { fieldToFind = ""; }
-    	else if (fieldToFind.indexOf("0") === 0) { fieldToFind = ""; }
-    	else if (fieldToFind.indexOf("STR-mod") >= 0) { fieldToFind = "STR-mod"; }
-    	else if (fieldToFind.indexOf("DEX-mod") >= 0) { fieldToFind = "DEX-mod"; }
-    	else if (fieldToFind.indexOf("CON-mod") >= 0) { fieldToFind = "CON-mod"; }
-    	else if (fieldToFind.indexOf("INT-mod") >= 0) { fieldToFind = "INT-mod"; }
-    	else if (fieldToFind.indexOf("WIS-mod") >= 0) { fieldToFind = "WIS-mod"; }
-    	else if (fieldToFind.indexOf("CHA-mod") >= 0) { fieldToFind = "CHA-mod"; }
-    	else if (fieldToFind.indexOf("melee") >= 0) { fieldToFind = "attk-melee"; }
-    	else if (fieldToFind.indexOf("Melee") >= 0) { fieldToFind = "attk-melee"; }
-    	else if (fieldToFind.indexOf("ranged") >= 0) { fieldToFind = "attk-ranged"; }
-    	else if (fieldToFind.indexOf("Ranged") >= 0) { fieldToFind = "attk-ranged"; }
-    	else if (fieldToFind.indexOf("CMB") >= 0) { fieldToFind = "CMB"; }
-    	else if (fieldToFind.indexOf("STR") >= 0) { fieldToFind = "STR"; }
-    	else if (fieldToFind.indexOf("DEX") >= 0) { fieldToFind = "DEX"; }
-    	else if (fieldToFind.indexOf("CON") >= 0) { fieldToFind = "CON"; }
-    	else if (fieldToFind.indexOf("INT") >= 0) { fieldToFind = "INT"; }
-    	else if (fieldToFind.indexOf("WIS") >= 0) { fieldToFind = "WIS"; }
-    	else if (fieldToFind.indexOf("CHA") >= 0) { fieldToFind = "CHA"; }
-    	return fieldToFind;
+        if (!fieldToFind) { fieldToFind = ""; }
+        else if (fieldToFind.indexOf("0") === 0) { fieldToFind = ""; }
+        else if (fieldToFind.indexOf("STR-mod") >= 0) { fieldToFind = "STR-mod"; }
+        else if (fieldToFind.indexOf("DEX-mod") >= 0) { fieldToFind = "DEX-mod"; }
+        else if (fieldToFind.indexOf("CON-mod") >= 0) { fieldToFind = "CON-mod"; }
+        else if (fieldToFind.indexOf("INT-mod") >= 0) { fieldToFind = "INT-mod"; }
+        else if (fieldToFind.indexOf("WIS-mod") >= 0) { fieldToFind = "WIS-mod"; }
+        else if (fieldToFind.indexOf("CHA-mod") >= 0) { fieldToFind = "CHA-mod"; }
+        else if (fieldToFind.indexOf("melee") >= 0) { fieldToFind = "attk-melee"; }
+        else if (fieldToFind.indexOf("Melee") >= 0) { fieldToFind = "attk-melee"; }
+        else if (fieldToFind.indexOf("ranged") >= 0) { fieldToFind = "attk-ranged"; }
+        else if (fieldToFind.indexOf("Ranged") >= 0) { fieldToFind = "attk-ranged"; }
+        else if (fieldToFind.indexOf("CMB") >= 0) { fieldToFind = "CMB"; }
+        else if (fieldToFind.indexOf("STR") >= 0) { fieldToFind = "STR"; }
+        else if (fieldToFind.indexOf("DEX") >= 0) { fieldToFind = "DEX"; }
+        else if (fieldToFind.indexOf("CON") >= 0) { fieldToFind = "CON"; }
+        else if (fieldToFind.indexOf("INT") >= 0) { fieldToFind = "INT"; }
+        else if (fieldToFind.indexOf("WIS") >= 0) { fieldToFind = "WIS"; }
+        else if (fieldToFind.indexOf("CHA") >= 0) { fieldToFind = "CHA"; }
+        return fieldToFind;
     },
 
     /* findMultiplier
@@ -13746,55 +13747,62 @@ var PFSheet = PFSheet || (function () {
      * @returns = a number indicating the multiplier for the ability mod
     */
     findMultiplier = function (str) {
-    	var retNum;
-    	if (!str) { return 0; }
-    	if (str.indexOf("1.5") >= 0) { retNum = 1.5; }
-    	else if (str.indexOf(".5") >= 0) { retNum = 0.5; }
-    	else if (str.indexOf("1/2") >= 0) { retNum = 0.5; }
-    	else if (str.indexOf("3/2") >= 0) { retNum = 1.5; }
-    	else if (str.indexOf("1 1/2") >= 0) { retNum = 1.5; }
-    	else if (str.indexOf("2") >= 0) { retNum = 2; }
-    	else { retNum = 1; }
-    	return retNum;
+        var retNum;
+        if (!str) { return 0; }
+        if (str.indexOf("1.5") >= 0) { retNum = 1.5; }
+        else if (str.indexOf(".5") >= 0) { retNum = 0.5; }
+        else if (str.indexOf("1/2") >= 0) { retNum = 0.5; }
+        else if (str.indexOf("3/2") >= 0) { retNum = 1.5; }
+        else if (str.indexOf("1 1/2") >= 0) { retNum = 1.5; }
+        else if (str.indexOf("2") >= 0) { retNum = 2; }
+        else { retNum = 1; }
+        return retNum;
     },
 
     /* updateRowTotal
-	* Adds up numbers and puts it in the first field of the fields array.
-	* All numbers are added up as FLOATS, and then FLOOR is used to round the sum down
+    * Adds up numbers and puts it in the first field of the fields array.
+    * All numbers are added up as FLOATS, and then FLOOR is used to round the sum down
     * @fields {Array}= array of field names, first element (fields[0]) MUST be the total field , rest are the fields to add up.
     * Updates total field if the total is not the same as the number in the total, or if the current value is not a number.
-    * @bonus {number} = a number that is added
+    * @bonus {number} = a number that is added/
     * @penalties {Array} = array of fieldnames to be subtracted from the total.
     */
-    updateRowTotal = function (fields, bonus, penalties, totalIsFloat) {
-    	var readFields = fields;
-    	if (!fields || fields.length === 0) { return; }
-    	if (penalties && penalties.length > 0) {
-    		readFields = readFields.concat(penalties);
-    	}
-    	getAttrs(readFields, function (v) {
-    		var currValue = parseInt(v[fields[0]], 10),
-            newValue = 0, penalty = 0, setter = {}, i;
-    		for (i = 1; i < fields.length; i++) {
-    			newValue += parseFloat(v[fields[i]]) || 0;
-    		}
-    		if (bonus && !isNaN(bonus)) { newValue += bonus; }
-    		if (penalties) {
-    			for (i = 0; i < penalties.length; i++) {
-    				penalty += parseFloat(v[penalties[i]]) || 0;
-    			}
-    			newValue -= penalty;
-    		}
-			if (!totalIsFloat) {
-				newValue = Math.floor(newValue);
-			}
-    		if (isNaN(currValue) || currValue !== newValue) {
-    			setter[fields[0]] = newValue;
-    			setAttrs(setter);
-    		}
-    	});
+    getRowTotal = function (fields, bonus, penalties, totalIsFloat, callback) {
+        var readFields = fields;
+        if (!fields || (! Array.isArray(fields)) || fields.length === 0 || typeof callback !== "function") { return; }
+        if (penalties && Array.isArray(penalties) && penalties.length > 0 ) {
+            readFields = readFields.concat(penalties);
+        }
+        getAttrs(readFields, function (v) {
+            var currValue = parseInt(v[fields[0]], 10),
+            newValue = 0, penalty = 0, i; //, setter = {}
+            for (i = 1; i < fields.length; i++) {
+                newValue += parseFloat(v[fields[i]]) || 0;
+            }
+            if (bonus && !isNaN(parseInt(bonus,10))) { newValue += bonus; }
+            if (penalties) {
+                for (i = 0; i < penalties.length; i++) {
+                    penalty += parseFloat(v[penalties[i]]) || 0;
+                }
+                newValue -= penalty;
+            }
+            if (!totalIsFloat) {
+                newValue = Math.floor(newValue);
+            }
+            if (isNaN(currValue) || currValue !== newValue) {
+                callback(newValue,v);
+            }
+        });
     },
 
+    updateRowTotal = function (fields, bonus, penalties, totalIsFloat) {
+        getRowTotal(fields,bonus,penalties,totalIsFloat,function(newValue,fieldValues){
+            var setter={};
+            setter[fields[0]] = newValue;
+            setAttrs(setter);           
+        });
+     },
+
 
     /* handleDropdown
      * Looks at a dropdown selected value, finds the matching attribute value, and then
@@ -13804,138 +13812,138 @@ var PFSheet = PFSheet || (function () {
      * @writeFields {string or Array} = One string or an array of strings that are fields to write the value to
      * @callback {function} optional = if we need to update the field, call this function
      *         with the value we set as 1st param,
-     * 	 If writeField is a string not an Array, then set old value as 2nd param (could be NaN) 
+     *   If writeField is a string not an Array, then set old value as 2nd param (could be NaN) 
      */
-	handleDropdown = function (readField, writeFields, callback, silently) {
-		SWUtils.handleDropdown(readField, writeFields, findAbilityInString, callback, silently);
-	},
+    handleDropdown = function (readField, writeFields, callback, silently) {
+        SWUtils.handleDropdown(readField, writeFields, findAbilityInString, callback, silently);
+    },
 
-	/****************************************** REPEATING SECTION SUPPORT *****************/
-	/* if id is not empty, then returns the ID with an underscore on the right.
-	*/
+    /****************************************** REPEATING SECTION SUPPORT *****************/
+    /* if id is not empty, then returns the ID with an underscore on the right.
+    */
     getRepeatingIDStr = function (id) {
-    	var idStr = "";
-    	if (id) { idStr = id + "_"; }
-    	return idStr;
+        var idStr = "";
+        if (id) { idStr = id + "_"; }
+        return idStr;
     },
 
-	isBadRowId = function (section, id, nullok) {
-		//TAS.debug("TRACE: isBadRowId section:" + section + ", id:" + id + ", null ok?:" + nullok);
-		if (!nullok && !id) {
-			return true;
-		}
-		if (id === section) {
-			return true;
-		}
-		if (section === "weapon") {
-			if (id && (id.indexOf("attack") >= 0 || id.indexOf("damage") >= 0)) {
-				return true;
-			}
-		}
-		return false;
-	},
+    isBadRowId = function (section, id, nullok) {
+        //TAS.debug("TRACE: isBadRowId section:" + section + ", id:" + id + ", null ok?:" + nullok);
+        if (!nullok && !id) {
+            return true;
+        }
+        if (id === section) {
+            return true;
+        }
+        if (section === "weapon") {
+            if (id && (id.indexOf("attack") >= 0 || id.indexOf("damage") >= 0)) {
+                return true;
+            }
+        }
+        return false;
+    },
 
-	/* 	setRepeatingRowDefaultFields
-	*	Sets the ID for a row if the newflag is not set to 1. 
-	* @section {string} the fieldset name after "section_"
-	* @id {string} the id ofthe row
-	* @forceReset {forceReset} = if true set the ID even if new_flag is not set.	
-	*/
+    /*  setRepeatingRowDefaultFields
+    *   Sets the ID for a row if the newflag is not set to 1. 
+    * @section {string} the fieldset name after "section_"
+    * @id {string} the id ofthe row
+    * @forceReset {forceReset} = if true set the ID even if new_flag is not set.    
+    */
     setRepeatingRowDefaultFields = function (section, id, forceReset) {
-    	var newflag = "repeating_" + section + "_" + id + "_new_flag",
-		rowid = "repeating_" + section + "_" + id + "_row_id",
-		fieldNames = [newflag, rowid];
-    	getAttrs(fieldNames, function (v) {
-    		var setter = {};
-    		if (v[newflag] != "1" || forceReset) {
-    			setter[rowid] = id;
-    			setter[newflag] = "1";
-    			setAttrs(setter);
-    		}
-    	});
+        var newflag = "repeating_" + section + "_" + id + "_new_flag",
+        rowid = "repeating_" + section + "_" + id + "_row_id",
+        fieldNames = [newflag, rowid];
+        getAttrs(fieldNames, function (v) {
+            var setter = {};
+            if (v[newflag] != "1" || forceReset) {
+                setter[rowid] = id;
+                setter[newflag] = "1";
+                setAttrs(setter);
+            }
+        });
     },
 
-	/* handleRepeatingRowOrdering
-	*  sets the ID fields and new_flag fields for all rows in the section
-	* @section {string} = the fieldset name after "section_"
-	* @forceReset {forceReset} = if true set the ID even if new_flag is not set.
-	*/
+    /* handleRepeatingRowOrdering
+    *  sets the ID fields and new_flag fields for all rows in the section
+    * @section {string} = the fieldset name after "section_"
+    * @forceReset {forceReset} = if true set the ID even if new_flag is not set.
+    */
     handleRepeatingRowOrdering = function (section, forceReset) {
-    	getSectionIDs("repeating_" + section, function (ids) {
-    		ids.forEach(function (id, index) {
-    			if (isBadRowId(section, id, false)) {
-    				TAS.error("handleRepeatingRowOrdering invalid id:" + id);
-    				return;
-    			}
-    			setRepeatingRowDefaultFields(section, id, forceReset);
-    		});
-    	});
+        getSectionIDs("repeating_" + section, function (ids) {
+            ids.forEach(function (id, index) {
+                if (isBadRowId(section, id, false)) {
+                    TAS.error("handleRepeatingRowOrdering invalid id:" + id);
+                    return;
+                }
+                setRepeatingRowDefaultFields(section, id, forceReset);
+            });
+        });
     },
 
-	/*************************************   MULTI PAGE ****************************************/
+    /*************************************   MULTI PAGE ****************************************/
     /*updateSize
     * When size attribute is changed, update CMD-size, size_display, size_skill, size_skill_double
     */
-	updateSizeFromText = function () {
-    	getAttrs(["size", "size_display"], function (v) {
-			var currSize = parseInt(v.size, 10) || 0,
-				sizeDisplay = v["size_display"],
-				size = 0, cmbsize = 0, skillSize = 0, doubleSkill = 0, badsize = false;
-			//TAS.debug("updateSizeFromText","sizeDisplay",sizeDisplay,"currsize",currSize);
-			if (!sizeDisplay) { return; }
-			sizeDisplay = sizeDisplay.toLowerCase();
-			switch (sizeDisplay) {
-				case "medium": break;
-				case "colossal": size = -8; skillSize = -8; break;
-				case "gargantuan": size = -4; skillSize = -6; break;
-				case "huge": size = -2; skillSize = -4; break;
-				case "large": size = -1; skillSize = -2; break;
-				case "small": size = 1; skillSize = 2; break;
-				case "tiny": size = 2; skillSize = 4; break;
-				case "diminutive": size = 4; skillSize = 6; break;
-				case "fine": size = 8; skillSize = 8; break;
-				default:
-					return;
-			}
-			//TAS.debug("updateSizeFromText","badsize",badsize,"size",size,"skillSize",skillSize);
-			doubleSkill = 2 * skillSize;
-    		cmbsize = size * -1;
-			if (size !== currSize) {
-				setAttrs({ "size": size, "size_skill": skillSize, "CMD-size": cmbsize, "size_skill_double": doubleSkill });
-				updateDamageNote(size, currSize);
-			}
+    updateSizeFromText = function () {
+        getAttrs(["size", "size_display"], function (v) {
+            var currSize = parseInt(v.size, 10) || 0,
+                sizeDisplay = v["size_display"],
+                size = 0, cmbsize = 0, skillSize = 0, doubleSkill = 0, badsize = false;
+            //TAS.debug("updateSizeFromText","sizeDisplay",sizeDisplay,"currsize",currSize);
+            if (!sizeDisplay) { return; }
+            sizeDisplay = sizeDisplay.toLowerCase();
+            switch (sizeDisplay) {
+                case "medium": break;
+                case "colossal": size = -8; skillSize = -8; break;
+                case "gargantuan": size = -4; skillSize = -6; break;
+                case "huge": size = -2; skillSize = -4; break;
+                case "large": size = -1; skillSize = -2; break;
+                case "small": size = 1; skillSize = 2; break;
+                case "tiny": size = 2; skillSize = 4; break;
+                case "diminutive": size = 4; skillSize = 6; break;
+                case "fine": size = 8; skillSize = 8; break;
+                default:
+                    return;
+            }
+            //TAS.debug("updateSizeFromText","badsize",badsize,"size",size,"skillSize",skillSize);
+            doubleSkill = 2 * skillSize;
+            cmbsize = size * -1;
+            if (size !== currSize) {
+                setAttrs({ "size": size, "size_skill": skillSize, "CMD-size": cmbsize, "size_skill_double": doubleSkill });
+                updateDamageNote(size, currSize);
+            }
 
-		});
-	},
-	updateSize = function () {
-		getAttrs(["size", "CMD-size", "size_display"], function (v) {
-			var size = parseInt(v.size, 10) || 0, currsize = (parseInt(v["CMD-size"], 10) || 0) * -1,
-				cmbsize = 0, skillSize = 0, doubleSkill = 0, sizeDisplay = "Medium";
+        });
+    },
+    updateSize = function () {
+        getAttrs(["size", "CMD-size", "size_display"], function (v) {
+            var size = parseInt(v.size, 10) || 0, currsize = (parseInt(v["CMD-size"], 10) || 0) * -1,
+                cmbsize = 0, skillSize = 0, doubleSkill = 0, sizeDisplay = "Medium";
 
-			switch (size) {
-				case 0: break;
-				case -8: skillSize = -8; sizeDisplay = "Colossal"; break;
-				case -4: skillSize = -6; sizeDisplay = "Gargantuan"; break;
-				case -2: skillSize = -4; sizeDisplay = "Huge"; break;
-				case -1: skillSize = -2; sizeDisplay = "Large"; break;
-				case 1: skillSize = 2; sizeDisplay = "Small"; break;
-				case 2: skillSize = 4; sizeDisplay = "Tiny"; break;
-				case 4: skillSize = 6; sizeDisplay = "Diminutive"; break;
-				case 8: skillSize = 8; sizeDisplay = "Fine"; break;
-				default:
-					return;
-			}
-    		doubleSkill = 2 * skillSize;
-			cmbsize = size * -1;
-    		if (size !== currsize) {
-				setAttrs({ "size_skill": skillSize, "CMD-size": cmbsize, "size_skill_double": doubleSkill });
-				setAttrs({ "size_display": sizeDisplay }, { silent: true });
-				updateDamageNote(size, currsize);
-			} else if (v["size_display"] !== sizeDisplay) {
-				//fix size display for old sheets
-				setAttrs({ "size_display": sizeDisplay }, { silent: true });
-			}
-    	});
+            switch (size) {
+                case 0: break;
+                case -8: skillSize = -8; sizeDisplay = "Colossal"; break;
+                case -4: skillSize = -6; sizeDisplay = "Gargantuan"; break;
+                case -2: skillSize = -4; sizeDisplay = "Huge"; break;
+                case -1: skillSize = -2; sizeDisplay = "Large"; break;
+                case 1: skillSize = 2; sizeDisplay = "Small"; break;
+                case 2: skillSize = 4; sizeDisplay = "Tiny"; break;
+                case 4: skillSize = 6; sizeDisplay = "Diminutive"; break;
+                case 8: skillSize = 8; sizeDisplay = "Fine"; break;
+                default:
+                    return;
+            }
+            doubleSkill = 2 * skillSize;
+            cmbsize = size * -1;
+            if (size !== currsize) {
+                setAttrs({ "size_skill": skillSize, "CMD-size": cmbsize, "size_skill_double": doubleSkill });
+                setAttrs({ "size_display": sizeDisplay }, { silent: true });
+                updateDamageNote(size, currsize);
+            } else if (v["size_display"] !== sizeDisplay) {
+                //fix size display for old sheets
+                setAttrs({ "size_display": sizeDisplay }, { silent: true });
+            }
+        });
     },
 
 
@@ -13944,242 +13952,242 @@ var PFSheet = PFSheet || (function () {
     * checks-cond, Phys-skills-cond, Perception-cond.
     */
     updateConditionCheckPenalty = function () {
-    	//TAS.debug("CCCCCCCCCCCCCCCCCCCCCCCCCCCC at updateConditionCheckPenalty");
-    	getAttrs(["condition-Blinded", "condition-Fear", "condition-Drained", "condition-Sickened", "condition-Wounds"
-		, "checks-cond", "Phys-skills-cond", "Perception-cond", "buff_Check-total"
-		, "CasterLevel-Penalty"]
-			, function (v) {
-				//there is no Fascinated, if we add it then:
-				//,"condition-Fascinated" -4 to perception
-				var buffCheck = parseInt(v["buff_Check-total"], 10) || 0
-				, drained = parseInt(v["condition-Drained"], 10) || 0
-				, fear = -1 * (parseInt(v["condition-Fear"], 10) || 0)
-				, sick = -1 * (parseInt(v["condition-Sickened"], 10) || 0)
-				, wounds = -1 * (parseInt(v["condition-Wounds"], 10) || 0)
-				, allSkillsMod = buffCheck + drained + fear + sick + wounds
-				, casterlevel = drained + wounds
-				, blindedMod = -2 * (parseInt(v["condition-Blinded"], 10) || 0)
-				, currAllSkills = parseInt(v["checks-cond"], 10)
-				, currPhysSkills = parseInt(v["Phys-skills-cond"], 10)
-				, currPerSkills = parseInt(v["Perception-cond"], 10)
-				, currCaster = parseInt(v["CasterLevel-Penalty"], 10)
-				, casterpen = 0
-				, setter = {}, setAny = 0;
+        //TAS.debug("CCCCCCCCCCCCCCCCCCCCCCCCCCCC at updateConditionCheckPenalty");
+        getAttrs(["condition-Blinded", "condition-Fear", "condition-Drained", "condition-Sickened", "condition-Wounds"
+        , "checks-cond", "Phys-skills-cond", "Perception-cond", "buff_Check-total"
+        , "CasterLevel-Penalty"]
+            , function (v) {
+                //there is no Fascinated, if we add it then:
+                //,"condition-Fascinated" -4 to perception
+                var buffCheck = parseInt(v["buff_Check-total"], 10) || 0
+                , drained = parseInt(v["condition-Drained"], 10) || 0
+                , fear = -1 * (parseInt(v["condition-Fear"], 10) || 0)
+                , sick = -1 * (parseInt(v["condition-Sickened"], 10) || 0)
+                , wounds = -1 * (parseInt(v["condition-Wounds"], 10) || 0)
+                , allSkillsMod = buffCheck + drained + fear + sick + wounds
+                , casterlevel = drained + wounds
+                , blindedMod = -2 * (parseInt(v["condition-Blinded"], 10) || 0)
+                , currAllSkills = parseInt(v["checks-cond"], 10)
+                , currPhysSkills = parseInt(v["Phys-skills-cond"], 10)
+                , currPerSkills = parseInt(v["Perception-cond"], 10)
+                , currCaster = parseInt(v["CasterLevel-Penalty"], 10)
+                , casterpen = 0
+                , setter = {}, setAny = 0;
 
-				if (allSkillsMod !== currAllSkills || isNaN(currAllSkills)) {
-					setter["checks-cond"] = allSkillsMod;
-					setAny = 1;
-				}
-				if (blindedMod !== currPhysSkills || isNaN(currPhysSkills)) {
-					setter["Phys-skills-cond"] = blindedMod;
-					setAny = 1;
-				}
-				if (blindedMod !== currPerSkills || isNaN(currPerSkills)) {
-					setter["Perception-cond"] = blindedMod;
-					setAny = 1;
-				}
-				if (casterlevel !== currCaster || isNaN(currCaster)) {
-					setter["CasterLevel-Penalty"] = casterlevel;
-					setAny = 1;
-				}
-				//TAS.debug("about to set " + setter);
-				if (setAny) {
-					setAttrs(setter);
-				}
-			});
+                if (allSkillsMod !== currAllSkills || isNaN(currAllSkills)) {
+                    setter["checks-cond"] = allSkillsMod;
+                    setAny = 1;
+                }
+                if (blindedMod !== currPhysSkills || isNaN(currPhysSkills)) {
+                    setter["Phys-skills-cond"] = blindedMod;
+                    setAny = 1;
+                }
+                if (blindedMod !== currPerSkills || isNaN(currPerSkills)) {
+                    setter["Perception-cond"] = blindedMod;
+                    setAny = 1;
+                }
+                if (casterlevel !== currCaster || isNaN(currCaster)) {
+                    setter["CasterLevel-Penalty"] = casterlevel;
+                    setAny = 1;
+                }
+                //TAS.debug("about to set " + setter);
+                if (setAny) {
+                    setAttrs(setter);
+                }
+            });
     },
 
-	/*************************************   CORE  PAGE ****************************************/
+    /*************************************   CORE  PAGE ****************************************/
 
-	/**** ABILITIES ****/
+    /**** ABILITIES ****/
     /* updateAbility
-	 * Updates the final ability score, ability modifier, condition column based on entries in ability grid plus conditions and buffs.
-	 * Also sets unconscious flag if ability damage is >= ability score.
-	 * Note: Ability value is not affected by damage and penalties, instead only modifier is affected.
+     * Updates the final ability score, ability modifier, condition column based on entries in ability grid plus conditions and buffs.
+     * Also sets unconscious flag if ability damage is >= ability score.
+     * 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, columnUpdated, columnVal, silently) {
-		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[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)))
-					, currAbility = parseInt(values[ability], 10)
-					, currMod = parseInt(values[ability + "-mod"], 10)
-					, mod = Math.floor((base - 10) / 2) - dmg - pen - cond
-				, setAny = 0, setter = {}
-				, params = { silent: false };
+    updateAbility = function (ability, columnUpdated, columnVal, silently) {
+        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[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)))
+                    , currAbility = parseInt(values[ability], 10)
+                    , currMod = parseInt(values[ability + "-mod"], 10)
+                    , mod = Math.floor((base - 10) / 2) - dmg - pen - cond
+                , setAny = 0, setter = {}
+                , params = { silent: false };
 
-				if (currAbility !== base || isNaN(currAbility)) { setter[ability] = base; setAny = 1; }
-				if (currMod !== mod || isNaN(currMod)) { setter[ability + "-mod"] = mod; setAny = 1; }
+                if (currAbility !== base || isNaN(currAbility)) { setter[ability] = base; setAny = 1; }
+                if (currMod !== mod || isNaN(currMod)) { setter[ability + "-mod"] = mod; setAny = 1; }
 
-				if (setAny) {
-					//TAS.debug({ "function": updateAbility, "ability": ability, "currAbility": currAbility, "currMod": currMod, "newAbility": base, "newMod": mod });
-					if (silently) { params.silent = true; }
-					setAttrs(setter, params);
-				}
-			});
-	},
+                if (setAny) {
+                    //TAS.debug({ "function": updateAbility, "ability": ability, "currAbility": currAbility, "currMod": currMod, "newAbility": base, "newMod": mod });
+                    if (silently) { params.silent = true; }
+                    setAttrs(setter, params);
+                }
+            });
+    },
 
 
-	/* updateConditionAbilityPenalty - for ability penalties, not "ability check" penalties
+    /* updateConditionAbilityPenalty - for ability penalties, not "ability check" penalties
     * 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
+        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);
-    		}
-    	});
+            , 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);
+            }
+        });
     },
 
 
-	/***** BUFFS *****/
+    /***** BUFFS *****/
 
     updateBuffTotals = function (col) {
-    	//TAS.debug("attrs=" + 'buff_' + col + '-total', "fields=" + 'buff-' + col + ', buff-enable_toggle')
-    	TAS.repeating('buff')
-	        .attrs('buff_' + col + '-total')
-	        .fields('buff-' + col, 'buff-enable_toggle', 'buff-' + col + '-show')
-	        .reduce(function (m, r) {
-	        	//TAS.debug("buff-" + col + "=" + r.I['buff-' + col], "buff-enable_toggle=" + r.I['buff-enable_toggle'], "buff-" + col + "-show=" + r.I['buff-' + col + '-show']);
-	        	m.mod += (r.I['buff-' + col] * (r.I['buff-enable_toggle'] & r.I['buff-' + col + '-show']));
-	        	return m;
-	        }, {
-	        	mod: 0
-	        }, function (m, r, a) {
-	        	a.S['buff_' + col + '-total'] = m.mod;
-	        })
-	        .execute();
+        //TAS.debug("attrs=" + 'buff_' + col + '-total', "fields=" + 'buff-' + col + ', buff-enable_toggle')
+        TAS.repeating('buff')
+            .attrs('buff_' + col + '-total')
+            .fields('buff-' + col, 'buff-enable_toggle', 'buff-' + col + '-show')
+            .reduce(function (m, r) {
+                //TAS.debug("buff-" + col + "=" + r.I['buff-' + col], "buff-enable_toggle=" + r.I['buff-enable_toggle'], "buff-" + col + "-show=" + r.I['buff-' + col + '-show']);
+                m.mod += (r.I['buff-' + col] * (r.I['buff-enable_toggle'] & r.I['buff-' + col + '-show']));
+                return m;
+            }, {
+                mod: 0
+            }, function (m, r, a) {
+                a.S['buff_' + col + '-total'] = m.mod;
+            })
+            .execute();
 
         var attribList = ["buffs"];
         buffColumns.forEach(function (col) {
             attribList.push("buff_" + col + "-total");
-	    });
+        });
         updateRowTotal(attribList);
     },
 
-	/* recalculateAllBuffs */
-	recalculateAllBuffs = function () {
-		getSectionIDs("repeating_buff", function (idarray) { // get the repeating set
-			//TAS.debug("idarray.length=" + idarray.length);
-			if (idarray.length > 0) {
-				_.each(idarray, function (currentID, i) { // loop through the set
-					//TAS.debug("currentID=" + currentID);
-					buffColumns.forEach(function (col) {
-						var attrib = "repeating_buff_" + currentID + "_buff-" + col;
-						//TAS.debug("attrib=" + attrib)
-						SWUtils.evaluateAndSetNumber(attrib + "_macro-text", attrib);
-					});
-				});
-			}
-		});
+    /* recalculateAllBuffs */
+    recalculateAllBuffs = function () {
+        getSectionIDs("repeating_buff", function (idarray) { // get the repeating set
+            //TAS.debug("idarray.length=" + idarray.length);
+            if (idarray.length > 0) {
+                _.each(idarray, function (currentID, i) { // loop through the set
+                    //TAS.debug("currentID=" + currentID);
+                    buffColumns.forEach(function (col) {
+                        var attrib = "repeating_buff_" + currentID + "_buff-" + col;
+                        //TAS.debug("attrib=" + attrib)
+                        SWUtils.evaluateAndSetNumber(attrib + "_macro-text", attrib);
+                    });
+                });
+            }
+        });
 
-		buffColumns.forEach(function (col) {
-			PFSheet.updateBuffTotals(col);
-		});
-	},
+        buffColumns.forEach(function (col) {
+            PFSheet.updateBuffTotals(col);
+        });
+    },
 
-	copyOldBuffToNewBuff = function (attribList) {
-		// This routine will generate a new repeating_buff entry using the old attribute data if it is populated
-		getAttrs(attribList, function (v) {
-			var buffData = [],
-			hasMacro = false;
+    copyOldBuffToNewBuff = function (attribList) {
+        // This routine will generate a new repeating_buff entry using the old attribute data if it is populated
+        getAttrs(attribList, function (v) {
+            var buffData = [],
+            hasMacro = false;
 
-			// Check for existing data in old buff attributes
-			attribList.forEach(function (attrib) {
-				buffData[attrib] = v[attrib];
-				//TAS.debug("old " + attrib + ":", buffData[attrib]);
-				if (typeof buffData[attrib] !== "undefined" && attrib.indexOf("macro") > 0) { hasMacro = true; } //&& buffData[attrib].length > 0 
-			});
-			//TAS.debug(buffData);
-			if (hasMacro || (typeof buffData[attribList[0]] !== "undefined" && buffData[attribList[0]].length > 0)) { // If the Name or a macro-text is populated
-				var newRowId = generateRowID(),
-				newRowAttrs = {},
-				setters = {},
-				targetAttribList = ["repeating_buff_" + newRowId + "_buff-name"],
-				i;
+            // Check for existing data in old buff attributes
+            attribList.forEach(function (attrib) {
+                buffData[attrib] = v[attrib];
+                //TAS.debug("old " + attrib + ":", buffData[attrib]);
+                if (typeof buffData[attrib] !== "undefined" && attrib.indexOf("macro") > 0) { hasMacro = true; } //&& buffData[attrib].length > 0 
+            });
+            //TAS.debug(buffData);
+            if (hasMacro || (typeof buffData[attribList[0]] !== "undefined" && buffData[attribList[0]].length > 0)) { // If the Name or a macro-text is populated
+                var newRowId = generateRowID(),
+                newRowAttrs = {},
+                setters = {},
+                targetAttribList = ["repeating_buff_" + newRowId + "_buff-name"],
+                i;
 
-				// Construct target attribute list
-				buffColumns.forEach(function (col) {
-					targetAttribList.push("repeating_buff_" + newRowId + "_buff-" + col + "_macro-text");
-				});
-				targetAttribList.push("repeating_buff_" + newRowId + "_buff-enable_toggle");
-				targetAttribList.push("repeating_buff_" + newRowId + "_buff-notes");
-				//TAS.debug("new targetAttribList=" + targetAttribList);
+                // Construct target attribute list
+                buffColumns.forEach(function (col) {
+                    targetAttribList.push("repeating_buff_" + newRowId + "_buff-" + col + "_macro-text");
+                });
+                targetAttribList.push("repeating_buff_" + newRowId + "_buff-enable_toggle");
+                targetAttribList.push("repeating_buff_" + newRowId + "_buff-notes");
+                //TAS.debug("new targetAttribList=" + targetAttribList);
 
-				// Create new repeating_buff entry
-				//TAS.debug("targetAttribList.length=" + targetAttribList.length);
-				for (i = 0; i < targetAttribList.length; i++) {
-					if (typeof buffData[attribList[i]] !== "undefined") {
-						newRowAttrs[targetAttribList[i]] = buffData[attribList[i]];
-						// Enable "show" for populated attribute
-						if (targetAttribList[i].indexOf("macro") > 0) {
-							var showStr = targetAttribList[i].replace("_macro-text", "-show");
-							//TAS.debug("showStr=" + showStr);
-							newRowAttrs[showStr] = "1";
-						} else if (targetAttribList[i].indexOf("notes") > 0 && buffData[attribList[i]].length > 0) {
-							var showStr = targetAttribList[i].replace("buff-notes", "description-show");
-							//TAS.debug("showStr=" + showStr);
-							newRowAttrs[showStr] = "1";
-						}
-					}
-				}
-				//TAS.debug("Creating new repeating entry", newRowAttrs);
-				setAttrs(newRowAttrs);
+                // Create new repeating_buff entry
+                //TAS.debug("targetAttribList.length=" + targetAttribList.length);
+                for (i = 0; i < targetAttribList.length; i++) {
+                    if (typeof buffData[attribList[i]] !== "undefined") {
+                        newRowAttrs[targetAttribList[i]] = buffData[attribList[i]];
+                        // Enable "show" for populated attribute
+                        if (targetAttribList[i].indexOf("macro") > 0) {
+                            var showStr = targetAttribList[i].replace("_macro-text", "-show");
+                            //TAS.debug("showStr=" + showStr);
+                            newRowAttrs[showStr] = "1";
+                        } else if (targetAttribList[i].indexOf("notes") > 0 && buffData[attribList[i]].length > 0) {
+                            var showStr = targetAttribList[i].replace("buff-notes", "description-show");
+                            //TAS.debug("showStr=" + showStr);
+                            newRowAttrs[showStr] = "1";
+                        }
+                    }
+                }
+                //TAS.debug("Creating new repeating entry", newRowAttrs);
+                setAttrs(newRowAttrs);
 
-				// Wipe out old data
-				for (i = 0; i < attribList.length; i++) {
-					setters[attribList[i]] = "";
-				}
-				//TAS.warn("Wiping out old buff data", setters);
-				setAttrs(setters);
-			}
-		});
-	},
+                // Wipe out old data
+                for (i = 0; i < attribList.length; i++) {
+                    setters[attribList[i]] = "";
+                }
+                //TAS.warn("Wiping out old buff data", setters);
+                setAttrs(setters);
+            }
+        });
+    },
 
     /* Migrate to new repeating entry buff system */
     migrateBuffs = function () {
-    	var i;
-    	for (i = 1; i <= 10; i++) {
-    		// Contruct old buff attribute list
-    		var attribList = ["buff" + i + "_Name"];
-    		buffColumns.forEach(function (col) {
-    			attribList.push("buff" + i + "_" + col + "_macro-text");
-    		});
-    		attribList.push("buff" + i + "_Toggle");
-    		attribList.push("buff" + i + "-notes");
-    		//TAS.debug("old attribList=" + attribList);
+        var i;
+        for (i = 1; i <= 10; i++) {
+            // Contruct old buff attribute list
+            var attribList = ["buff" + i + "_Name"];
+            buffColumns.forEach(function (col) {
+                attribList.push("buff" + i + "_" + col + "_macro-text");
+            });
+            attribList.push("buff" + i + "_Toggle");
+            attribList.push("buff" + i + "-notes");
+            //TAS.debug("old attribList=" + attribList);
 
-    		copyOldBuffToNewBuff(attribList);
+            copyOldBuffToNewBuff(attribList);
 
-    		// Delete obsoleted attributes
-    		//buffs_1-5-show
-    		//buffs_6-10-show
-    		//buffs-apply
-    	}
+            // Delete obsoleted attributes
+            //buffs_1-5-show
+            //buffs_6-10-show
+            //buffs-apply
+        }
     },
 
 
@@ -14190,99 +14198,114 @@ var PFSheet = PFSheet || (function () {
      *
      */
     updateModifiedSpeed = function () {
-        var attribList = ["current-load", "speed-base", "speed-modified", "speed-run", "load-heavy", "carried-total", "race"];
+        var attribList = ["current-load", "speed-base", "speed-modified", "speed-run", "load-heavy", "carried-total", "race", "speed-source", "run-mult"];
         defenseArmorShieldRows.forEach(function (row) {
             attribList.push(row + "-equipped");
             attribList.push(row + "-type");
-		});
-		getAttrs(attribList, function (v) {
-            	var currMod = parseInt(v["speed-modified"], 10) || 0,
-				currRun = parseInt(v["speed-run"], 10) || 0,
-				load = parseInt(v["current-load"], 10) || 0,
-				base = parseInt(v["speed-base"], 10) || 0,
-				heavy = parseInt(v["load-heavy"], 10) || 0,
-				carried = parseInt(v["carried-total"], 10) || 0;
-            	//TAS.debug("speed-modified=" + currMod + ", speed-run=" + currRun + ", current-load=" + load + ", speed-base=" + base + ", load-heavy=" + heavy + ", carried-total=" + carried);
+        });
+        getAttrs(attribList, function (v) {
+            var currMod = parseInt(v["speed-modified"], 10) || 0,
+            currRun = parseInt(v["speed-run"], 10) || 0,
+            load = parseInt(v["current-load"], 10) || 0,
+            base = parseInt(v["speed-base"], 10) || 0,
+            heavy = parseInt(v["load-heavy"], 10) || 0,
+            carried = parseInt(v["carried-total"], 10) || 0,
+            speedDropdown = parseInt(v["speed-source"],10) || 0,
+            origRunMult = isNaN(parseInt(v["run-mult"],10))?4:parseInt(v["run-mult"],10),
+            newSpeed= base, newLoadSpeed= base, newArmorSpeed= base, 
+            runMult=origRunMult,
+            newRun=base*runMult, 
+            isDwarf=false, inHeavy=false, inMedium=false;
+            //TAS.debug("speed-modified=" + currMod + ", speed-run=" + currRun + ", current-load=" + load + ", speed-base=" + base + ", load-heavy=" + heavy + ", carried-total=" + carried);
 
-            	var newLoadSpeed, newArmorSpeed, newRun, runMult = 4;
-            	if (load > 0) { //Medium Or Heavy load
-            		if (carried > heavy) {
-            			newLoadSpeed = 5;
-            			newRun = 5;
-            			runMult = 0;
-            		} else {
-            			if (base <= 5) { newLoadSpeed = 5; }
-            			else if (base % 15 == 0) { newLoadSpeed = base * 2 / 3; }
-            			else if ((base + 5) % 15 == 0) { newLoadSpeed = (base + 5) * 2 / 3; }
-            			else { newLoadSpeed = ((base + 10) * 2 / 3) - 5; }
+            // #0: Armor, Shield & Load
+            // #1: Armor & Shield only
+            // #2: Load only
+            // #3: None
+            if (speedDropdown === 3) {
+                newSpeed = base;
+            } else {
+                if (speedDropdown === 0 || speedDropdown === 2) {
+                    if (load > 0) { //Medium Or Heavy load
+                        if (carried > heavy) {
+                            newLoadSpeed = 5;
+                            newRun = 5;
+                            runMult = 0;
+                        } else {
+                            if (base <= 5) { newLoadSpeed = 5; }
+                            else if (base % 15 == 0) { newLoadSpeed = base * 2 / 3; }
+                            else if ((base + 5) % 15 == 0) { newLoadSpeed = (base + 5) * 2 / 3; }
+                            else { newLoadSpeed = ((base + 10) * 2 / 3) - 5; }
 
-            			if (load > 1) { runMult = 3; } //Heavy load
-            		}
-            	} else { //Light load
-            		newLoadSpeed = base;
-            		runMult = 4;
-            	}
-            	//TAS.debug("newLoadSpeed=" + newLoadSpeed + ", newRun=" + newRun + ", runMult=" + runMult);
+                            if (load > 1) { runMult -=1; } //Heavy load
+                        }
+                    } else { //Light load
+                        newLoadSpeed = base;
+                    }
+                }
+                //TAS.debug("newLoadSpeed=" + newLoadSpeed + ", newRun=" + newRun + ", runMult=" + runMult);
 
-            	//TAS.debug("race=" + v.race + ", armor-type=" + v["armor-type"] + ", armor-equipped=" + v["armor-equipped"] +
-            	//            ", armor2-type=" + v["armor2-type"] + ", armor2-equipped=" + v["armor2-equipped"] + 
-            	//            ", armor3-type=" + v["armor3-type"] + ", armor3-equipped=" + v["armor3-equipped"]);
-            	var isDwarf = typeof v.race === "undefined" ? false : v.race.toLowerCase().indexOf("dwarf") >= 0;
-            	var inHeavy = (v["armor-type"] == "Heavy" && (v["armor-equipped"] == "1" || typeof v["armor-equipped"] === "undefined")) ||
-					(v["armor2-type"] == "Heavy" && (v["armor2-equipped"] == "1" || typeof v["armor2-equipped"] === "undefined")) ||
-					(v["armor3-type"] == "Heavy" && (v["armor3-equipped"] == "1" || typeof v["armor3-equipped"] === "undefined"));
-            	var inMedium = (v["armor-type"] == "Medium" && (v["armor-equipped"] == "1" || v["armor-equipped"] === "undefined")) ||
-					(v["armor2-type"] == "Medium" && (v["armor2-equipped"] == "1" || typeof v["armor2-equipped"] === "undefined")) ||
-					(v["armor3-type"] == "Medium" && (v["armor3-equipped"] == "1" || typeof v["armor3-equipped"] === "undefined"));
-            	//TAS.debug("inHeavy=" + inHeavy + ", inMedium=" + inMedium + ", isDwarf=" + isDwarf);
-			if (inHeavy && runMult > 3) { runMult = 3; } // Max x3 run in heavy armor
-            	if (!isDwarf && (inHeavy || inMedium)) {
-            		if (base <= 5) { newArmorSpeed = 5; }
-            		else if (base % 15 == 0) { newArmorSpeed = base * 2 / 3; }
-            		else if ((base + 5) % 15 == 0) { newArmorSpeed = (base + 5) * 2 / 3; }
-            		else { newArmorSpeed = ((base + 10) * 2 / 3) - 5; }
-            	} else {
-            		newArmorSpeed = base;
-            	}
-            	//TAS.debug("newArmorSpeed=" + newArmorSpeed + ", runMult=" + runMult);
+                //TAS.debug("race=" + v.race + ", armor-type=" + v["armor-type"] + ", armor-equipped=" + v["armor-equipped"] +
+                //            ", armor2-type=" + v["armor2-type"] + ", armor2-equipped=" + v["armor2-equipped"] +
+                //            ", armor3-type=" + v["armor3-type"] + ", armor3-equipped=" + v["armor3-equipped"]);
+                if (speedDropdown === 0 || speedDropdown === 1) {
+                    isDwarf = typeof v.race === "undefined" ? false : v.race.toLowerCase().indexOf("dwarf") >= 0;
+                    inHeavy = (v["armor-type"] == "Heavy" && (v["armor-equipped"] == "1" || typeof v["armor-equipped"] === "undefined")) ||
+                        (v["armor2-type"] == "Heavy" && (v["armor2-equipped"] == "1" || typeof v["armor2-equipped"] === "undefined")) ||
+                        (v["armor3-type"] == "Heavy" && (v["armor3-equipped"] == "1" || typeof v["armor3-equipped"] === "undefined"));
+                    inMedium = (v["armor-type"] == "Medium" && (v["armor-equipped"] == "1" || v["armor-equipped"] === "undefined")) ||
+                        (v["armor2-type"] == "Medium" && (v["armor2-equipped"] == "1" || typeof v["armor2-equipped"] === "undefined")) ||
+                        (v["armor3-type"] == "Medium" && (v["armor3-equipped"] == "1" || typeof v["armor3-equipped"] === "undefined"));
+                    //TAS.debug("inHeavy=" + inHeavy + ", inMedium=" + inMedium + ", isDwarf=" + isDwarf);
+                    if (inHeavy && runMult === origRunMult ) { runMult -= 1; } // Max x3 run in heavy armor
+                    if (!isDwarf && (inHeavy || inMedium)) {
+                        if (base <= 5) { newArmorSpeed = 5; }
+                        else if (base % 15 == 0) { newArmorSpeed = base * 2 / 3; }
+                        else if ((base + 5) % 15 == 0) { newArmorSpeed = (base + 5) * 2 / 3; }
+                        else { newArmorSpeed = ((base + 10) * 2 / 3) - 5; }
+                    } else {
+                        newArmorSpeed = base;
+                    }
+                }
+                //TAS.debug("newArmorSpeed=" + newArmorSpeed + ", runMult=" + runMult);
+                newSpeed = Math.min(newLoadSpeed, newArmorSpeed);
+                //TAS.debug("newSpeed=" + newSpeed + ", runMult=" + runMult);
+            }
 
-            	var newSpeed = Math.min(newLoadSpeed, newArmorSpeed);
-            	//TAS.debug("newSpeed=" + newSpeed + ", runMult=" + runMult);
+            if (runMult > 0) { newRun = newSpeed * runMult; }
+            //TAS.debug("newRun=" + newRun);
 
-            	if (runMult > 0) { newRun = newSpeed * runMult; }
-            	//TAS.debug("newRun=" + newRun);
-
-            	if (currMod !== newSpeed) { setAttrs({ "speed-modified": newSpeed }); }
-            	if (currRun !== newRun) { setAttrs({ "speed-run": newRun }); }
-            });
+            if (currMod !== newSpeed) { setAttrs({ "speed-modified": newSpeed }); }
+            if (currRun !== newRun) { setAttrs({ "speed-run": newRun }); }
+        });
     },
 
     /* updateGrapple
     * Ensures Grapple and Pin are mutually exclusive
     */
     updateGrapple = function () {
-    	getAttrs(["condition-Pinned", "condition-Grappled"], function (values) {
-    		if (values["condition-Pinned"] !== "0" && values["condition-Grappled"] !== "0") {
-    			setAttrs({ "condition-Pinned": "0" });
-    		} else {
-    			//user hit either pinned and it undid grapple, or hit grapple first time.
-    			updateConditionAbilityPenalty();
-    		}
-    	});
+        getAttrs(["condition-Pinned", "condition-Grappled"], function (values) {
+            if (values["condition-Pinned"] !== "0" && values["condition-Grappled"] !== "0") {
+                setAttrs({ "condition-Pinned": "0" });
+            } else {
+                //user hit either pinned and it undid grapple, or hit grapple first time.
+                updateConditionAbilityPenalty();
+            }
+        });
     },
 
     /* updatePin
     * Ensures Grapple and Pin are mutually exclusive
     */
     updatePin = function () {
-    	getAttrs(["condition-Pinned", "condition-Grappled"], function (values) {
-    		if (values["condition-Pinned"] !== "0" && values["condition-Grappled"] !== "0") {
-    			setAttrs({ "condition-Grappled": "0" });
-    		} else {
-    			//user hit grapple and it  undid pinned, or hit pinned first time.
-    			updateConditionAbilityPenalty();
-    		}
-    	});
+        getAttrs(["condition-Pinned", "condition-Grappled"], function (values) {
+            if (values["condition-Pinned"] !== "0" && values["condition-Grappled"] !== "0") {
+                setAttrs({ "condition-Grappled": "0" });
+            } else {
+                //user hit grapple and it  undid pinned, or hit pinned first time.
+                updateConditionAbilityPenalty();
+            }
+        });
     },
 
 
@@ -14290,7 +14313,7 @@ var PFSheet = PFSheet || (function () {
      * updates the init
      */
     updateInit = function () {
-    	updateRowTotal(["init", "init-ability-mod", "init-trait", "init-misc"], 0, ["condition-Deafened"]);
+        updateRowTotal(["init", "init-ability-mod", "init-trait", "init-misc"], 0, ["condition-Deafened"]);
     },
 
 
@@ -14298,34 +14321,34 @@ var PFSheet = PFSheet || (function () {
      * sets max HP
      */
     updateHP = function () {
-    	getAttrs(["HP_max", "HP-ability-mod", "level", "total-hp", "total-mythic-hp", "condition-Drained", "HP-formula-mod", "HP-misc", "mythic-adventures-show"], function (values) {
-    		var totalhp = ((parseInt(values["HP-ability-mod"], 10) || 0) * (parseInt(values["level"], 10) || 0)) +
+        getAttrs(["HP_max", "HP-ability-mod", "level", "total-hp", "total-mythic-hp", "condition-Drained", "HP-formula-mod", "HP-misc", "mythic-adventures-show"], function (values) {
+            var totalhp = ((parseInt(values["HP-ability-mod"], 10) || 0) * (parseInt(values["level"], 10) || 0)) +
                  (parseInt(values["total-hp"], 10) || 0) +
-				 (parseInt(values["HP-misc"], 10) || 0) +
+                 (parseInt(values["HP-misc"], 10) || 0) +
                  (parseInt(values["HP-formula-mod"], 10) || 0) +
                  (5 * (parseInt(values["condition-Drained"], 10) || 0));
-    		if (values["mythic-adventures-show"] == "1") {
-    			totalhp += (parseInt(values["total-mythic-hp"], 10) || 0);
-    		}
-    		var grazedhp = Math.floor(totalhp * 0.75),
+            if (values["mythic-adventures-show"] == "1") {
+                totalhp += (parseInt(values["total-mythic-hp"], 10) || 0);
+            }
+            var grazedhp = Math.floor(totalhp * 0.75),
                 woundedhp = Math.floor(totalhp / 2),
                 criticalhp = Math.floor(totalhp / 4);
-    		var currHP = parseInt(values["HP_max"], 10) || 0;
-    		if (currHP !== totalhp) {
-    			setAttrs({ "HP_max": totalhp, "HP_grazed": grazedhp, "HP_wounded": woundedhp, "HP_critical": criticalhp });
-    		}
-    	});
+            var currHP = parseInt(values["HP_max"], 10) || 0;
+            if (currHP !== totalhp) {
+                setAttrs({ "HP_max": totalhp, "HP_grazed": grazedhp, "HP_wounded": woundedhp, "HP_critical": criticalhp });
+            }
+        });
     },
 
     /* updateTempHP
      * sets temp hp
      */
     updateTempHP = function () {
-    	getAttrs(["HP-temp", "HP-temp-misc", "buff_HP-temp-total"], function (values) {
-    		var totaltemp = (parseInt(values["HP-temp-misc"], 10) || 0) + (parseInt(values["buff_HP-temp-total"], 10) || 0),
+        getAttrs(["HP-temp", "HP-temp-misc", "buff_HP-temp-total"], function (values) {
+            var totaltemp = (parseInt(values["HP-temp-misc"], 10) || 0) + (parseInt(values["buff_HP-temp-total"], 10) || 0),
                currtemp = parseInt(values["HP-temp"], 10) || 0;
-    		if (currtemp !== totaltemp) { setAttrs({ "HP-temp": totaltemp }); }
-    	});
+            if (currtemp !== totaltemp) { setAttrs({ "HP-temp": totaltemp }); }
+        });
     },
 
 
@@ -14334,34 +14357,34 @@ var PFSheet = PFSheet || (function () {
 
     /* updateNPCHP
     * updates the NPC hp, 
-	* also PC hp, if config page says to
-	*/
+    * also PC hp, if config page says to
+    */
     updateNPCHP = function () {
-    	getAttrs(["NPC-HD", "NPC-HD-num", "NPC-HD2", "NPC-HD-num2", "NPC-HD-misc-mod", "NPC-HP_max", "NPC-HP", "sync_npc_pc_hp"], function (v) {
-    		var hp = Math.floor(((parseInt(v["NPC-HD"], 10) || 0) + 1) / 2 * (parseInt(v["NPC-HD-num"], 10) || 0))
+        getAttrs(["NPC-HD", "NPC-HD-num", "NPC-HD2", "NPC-HD-num2", "NPC-HD-misc-mod", "NPC-HP_max", "NPC-HP", "sync_npc_pc_hp"], function (v) {
+            var hp = Math.floor(((parseInt(v["NPC-HD"], 10) || 0) + 1) / 2 * (parseInt(v["NPC-HD-num"], 10) || 0))
                     + Math.floor(((parseInt(v["NPC-HD2"], 10) || 0) + 1) / 2 * (parseInt(v["NPC-HD-num2"], 10) || 0))
                     + (parseInt(v["NPC-HD-misc-mod"], 10) || 0),
                 maxhp = parseInt(v["NPC-HP_max"], 10) || 0,
                 currhp = parseInt(v["NPC-HP"], 10) || 0,
                 updatehp = parseInt(v.sync_npc_pc_hp, 10) || 0,
                 setter = {}, setAny = 0;
-    		//TAS.debug("HHHHHHHHHHHHHHHHHHHHHHHHH updateNPCHP, hp:" + hp + ", maxhp:" + maxhp);
-    		//TAS.debug(v);
-    		if (hp !== maxhp) {
-    			setter["NPC-HP_max"] = hp;
-    			if (updatehp) { setter["HP"] = hp; }
-    			setAny = 1;
-    			//first time
-    			if ((currhp === 0 && maxhp === 0) || (currhp === maxhp)) {
-    				setter["NPC-HP"] = hp;
-    				if (updatehp) { setter["HP_max"] = hp; }
-    			}
-    		}
-    		if (setAny) { setAttrs(setter); }
-    	});
+            //TAS.debug("HHHHHHHHHHHHHHHHHHHHHHHHH updateNPCHP, hp:" + hp + ", maxhp:" + maxhp);
+            //TAS.debug(v);
+            if (hp !== maxhp) {
+                setter["NPC-HP_max"] = hp;
+                if (updatehp) { setter["HP"] = hp; }
+                setAny = 1;
+                //first time
+                if ((currhp === 0 && maxhp === 0) || (currhp === maxhp)) {
+                    setter["NPC-HP"] = hp;
+                    if (updatehp) { setter["HP_max"] = hp; }
+                }
+            }
+            if (setAny) { setAttrs(setter); }
+        });
     },
 
-	/************************************* CLASS PAGE ***********************************/
+    /************************************* CLASS PAGE ***********************************/
 
 
     /* updateClassInformation
@@ -14371,163 +14394,163 @@ var PFSheet = PFSheet || (function () {
      *   hp, fchp, bab, skill, fcskill, alt, Fort, Ref, Will, level
      */
     updateClassInformation = function (col) {
-    	if (!col) { return; }
-    	if (col === "fchp") { col = "hp"; }
-    	var getFields = [], totalColName,
+        if (!col) { return; }
+        if (col === "fchp") { col = "hp"; }
+        var getFields = [], totalColName,
             col0Name = "class-0-" + col, col1Name = "class-1-" + col, col2Name = "class-2-" + col
             , col3Name = "class-3-" + col, col4Name = "class-4-" + col, col5Name = "class-5-" + col
             , col0NameTwo, col1NameTwo, col2NameTwo, col3NameTwo, col4NameTwo, col5NameTwo;
-    	totalColName = (col === "bab" || col === "level") ? col : "total-" + col;
-		getFields = [totalColName, col0Name, col1Name, col2Name, col3Name, col4Name, col5Name];
-    	if (col !== "skill") {
-    		if (col === "hp") {
-    			col0NameTwo = "class-0-fc" + col;
-    			col1NameTwo = "class-1-fc" + col;
-    			col2NameTwo = "class-2-fc" + col;
-    			col3NameTwo = "class-3-fc" + col;
-    			col4NameTwo = "class-4-fc" + col;
-    			col5NameTwo = "class-5-fc" + col;
-    			getFields = getFields.concat([col0NameTwo, col1NameTwo, col2NameTwo, col3NameTwo, col4NameTwo, col5NameTwo]);
-    		}
-    		//TAS.debug(getFields);
-    		updateRowTotal(getFields);
-    	} else {
-    		col0NameTwo = "class-0-level";
-    		col1NameTwo = "class-1-level";
-    		col2NameTwo = "class-2-level";
-    		col3NameTwo = "class-3-level";
-    		col4NameTwo = "class-4-level";
-    		col5NameTwo = "class-5-level";
-    		getFields = getFields.concat([col0NameTwo, col1NameTwo, col2NameTwo, col3NameTwo, col4NameTwo, col5NameTwo]);
-    		//TAS.debug(getFields);
-    		getAttrs(getFields, function (v) {
-    			var setter = {}, currTot,
+        totalColName = (col === "bab" || col === "level") ? col : "total-" + col;
+        getFields = [totalColName, col0Name, col1Name, col2Name, col3Name, col4Name, col5Name];
+        if (col !== "skill") {
+            if (col === "hp") {
+                col0NameTwo = "class-0-fc" + col;
+                col1NameTwo = "class-1-fc" + col;
+                col2NameTwo = "class-2-fc" + col;
+                col3NameTwo = "class-3-fc" + col;
+                col4NameTwo = "class-4-fc" + col;
+                col5NameTwo = "class-5-fc" + col;
+                getFields = getFields.concat([col0NameTwo, col1NameTwo, col2NameTwo, col3NameTwo, col4NameTwo, col5NameTwo]);
+            }
+            //TAS.debug(getFields);
+            updateRowTotal(getFields);
+        } else {
+            col0NameTwo = "class-0-level";
+            col1NameTwo = "class-1-level";
+            col2NameTwo = "class-2-level";
+            col3NameTwo = "class-3-level";
+            col4NameTwo = "class-4-level";
+            col5NameTwo = "class-5-level";
+            getFields = getFields.concat([col0NameTwo, col1NameTwo, col2NameTwo, col3NameTwo, col4NameTwo, col5NameTwo]);
+            //TAS.debug(getFields);
+            getAttrs(getFields, function (v) {
+                var setter = {}, currTot,
                 tot = Math.floor((parseFloat(v[col0Name], 10) || 0) * (parseInt(v[col0NameTwo], 10) || 0) +
                         (parseFloat(v[col1Name], 10) || 0) * (parseInt(v[col1NameTwo], 10) || 0) +
                         (parseFloat(v[col2Name], 10) || 0) * (parseInt(v[col2NameTwo], 10) || 0) +
                         (parseFloat(v[col3Name], 10) || 0) * (parseInt(v[col3NameTwo], 10) || 0) +
                         (parseFloat(v[col4Name], 10) || 0) * (parseInt(v[col4NameTwo], 10) || 0) +
                         (parseFloat(v[col5Name], 10) || 0) * (parseInt(v[col5NameTwo], 10) || 0));
-    			currTot = parseInt(v[totalColName], 10);
-    			//TAS.debug("tot is " + tot + ", currtot = " + currTot);
-    			if (isNaN(currTot) || tot !== currTot) {
-    				setter[totalColName] = tot;
-    				setAttrs(setter);
-    			}
-    		});
-    	}
+                currTot = parseInt(v[totalColName], 10);
+                //TAS.debug("tot is " + tot + ", currtot = " + currTot);
+                if (isNaN(currTot) || tot !== currTot) {
+                    setter[totalColName] = tot;
+                    setAttrs(setter);
+                }
+            });
+        }
     },
 
 
-	/******* MYTHIC ***************/
+    /******* MYTHIC ***************/
 
     /* updateMythicPathInformation
     * Updates total at bottom of Mythic Path Information grid
     */
     updateMythicPathInformation = function () {
-    	getAttrs(["mythic-tier", "mythic-hp", "total-mythic-hp"], function (values) {
-    		var tot = (parseInt(values["mythic-tier"], 10) || 0) * (parseInt(values["mythic-hp"], 10) || 0),
+        getAttrs(["mythic-tier", "mythic-hp", "total-mythic-hp"], function (values) {
+            var tot = (parseInt(values["mythic-tier"], 10) || 0) * (parseInt(values["mythic-hp"], 10) || 0),
             currTot = parseInt(values["total-mythic-hp"], 10) || 0;
-    		//TAS.debug("tot=" + tot + ", currTot=" + currTot);
-    		if (currTot !== tot) { setAttrs({ "total-mythic-hp": tot }); }
-    	});
+            //TAS.debug("tot=" + tot + ", currTot=" + currTot);
+            if (currTot !== tot) { setAttrs({ "total-mythic-hp": tot }); }
+        });
     },
 
     /* updateTierMythicPower
     * sets tier mp
     */
     updateTierMythicPower = function () {
-    	//TAS.debug("entered updateTierMythicPower");
-    	getAttrs(["tier-mythic-power", "mythic-tier"], function (values) {
-    		var totalTier = 3 + 2 * (parseInt(values["mythic-tier"], 10) || 0),
+        //TAS.debug("entered updateTierMythicPower");
+        getAttrs(["tier-mythic-power", "mythic-tier"], function (values) {
+            var totalTier = 3 + 2 * (parseInt(values["mythic-tier"], 10) || 0),
             curr = parseInt(values["tier-mythic-power"], 10) || 0;
-    		//TAS.debug("totalTier=" + totalTier + ", curr=" + curr);
-    		if (curr !== totalTier) { setAttrs({ "tier-mythic-power": totalTier }); }
-    	});
+            //TAS.debug("totalTier=" + totalTier + ", curr=" + curr);
+            if (curr !== totalTier) { setAttrs({ "tier-mythic-power": totalTier }); }
+        });
     },
 
     /******* PSIONIC ***************/
 
     updatePsionicBonusPower = function () {
-		getAttrs(["selected-ability-psionic-power", "psionic-level-total", "ability-psionic-power"], function (v) {
-			SWUtils.evaluateExpression(v["selected-ability-psionic-power"], function (value) {
-				var ability = 0;
-				if (typeof value !== "undefined" && value !== null && !isNaN(value)) {
-					ability = parseInt(value, 10) || 0;
-				}
-				var currentTotal = parseInt(v["ability-psionic-power"], 10) || 0,
-			    newTotal = Math.floor(ability * (parseInt(v["psionic-level-total"], 10) || 0) * 0.5);
-				//TAS.debug("ability=" + ability, "newTotal=" + newTotal, "currentTotal=" + currentTotal);
-				if (currentTotal !== newTotal) { setAttrs({ "ability-psionic-power": newTotal }); }
-			});
-		});
+        getAttrs(["selected-ability-psionic-power", "psionic-level-total", "ability-psionic-power"], function (v) {
+            SWUtils.evaluateExpression(v["selected-ability-psionic-power"], function (value) {
+                var ability = 0;
+                if (typeof value !== "undefined" && value !== null && !isNaN(value)) {
+                    ability = parseInt(value, 10) || 0;
+                }
+                var currentTotal = parseInt(v["ability-psionic-power"], 10) || 0,
+                newTotal = Math.floor(ability * (parseInt(v["psionic-level-total"], 10) || 0) * 0.5);
+                //TAS.debug("ability=" + ability, "newTotal=" + newTotal, "currentTotal=" + currentTotal);
+                if (currentTotal !== newTotal) { setAttrs({ "ability-psionic-power": newTotal }); }
+            });
+        });
     },
 
-	/************************************* DEFENSE PAGE ***********************************/
+    /************************************* DEFENSE PAGE ***********************************/
 
-	/*handleNonFFDefenseDropdown
-	* This handles the ability dropdown for AC and CMD. (except STR to CMD, just the "DEX" modifier)
-	* If the modifier is negative, then apply it to flat footed as well.
-	* @ddField {string} = field for ability dropdown
-	* @modField {string} = mod field containing value of ddField
-	* @ffField {string} = field for correlated flat footed ability dropdown
-	* @ffModField {string} = mod field containing value of ffField (to write to if modField is negative)
-	*/
-	handleNonFFDefenseDropdown = function (ddField, modField, ffField, ffModField) {
-		//TAS.debug("at handleNonFFDefenseDropdown ddField=" + ddField + ", modField=" + modField + ", ffField=" + ffField + ", ffModField=" + ffModField);
-		handleDropdown(ddField, modField, function (dexmod, oldmod) {
-			var setter = {};
-			if (dexmod < 0) {
-				setter[ffModField] = dexmod;
-				setAttrs(setter);
-			} else if (oldmod < 0) {
-				//if it changes from negative to 0 or  positive then reset flat footed - this may result in it being called twice but meh.
-				handleDropdown(ffField, ffModField);
-			}
-		});
-	},
+    /*handleNonFFDefenseDropdown
+    * This handles the ability dropdown for AC and CMD. (except STR to CMD, just the "DEX" modifier)
+    * If the modifier is negative, then apply it to flat footed as well.
+    * @ddField {string} = field for ability dropdown
+    * @modField {string} = mod field containing value of ddField
+    * @ffField {string} = field for correlated flat footed ability dropdown
+    * @ffModField {string} = mod field containing value of ffField (to write to if modField is negative)
+    */
+    handleNonFFDefenseDropdown = function (ddField, modField, ffField, ffModField) {
+        //TAS.debug("at handleNonFFDefenseDropdown ddField=" + ddField + ", modField=" + modField + ", ffField=" + ffField + ", ffModField=" + ffModField);
+        handleDropdown(ddField, modField, function (dexmod, oldmod) {
+            var setter = {};
+            if (dexmod < 0) {
+                setter[ffModField] = dexmod;
+                setAttrs(setter);
+            } else if (oldmod < 0) {
+                //if it changes from negative to 0 or  positive then reset flat footed - this may result in it being called twice but meh.
+                handleDropdown(ffField, ffModField);
+            }
+        });
+    },
 
-	/*handleDefenseDropdown
-	* All dropdowns in the defense grid: AC, flat footed AC, touch, CMD, flat footed CMD. 
-	* it calls handleNonFFDefenseDropdown for the 3 non flat footed
-	* otherwise it just calls handleDropdown directly.
-	*
-	* NOTE: due to the way eventInfo.sourceAttribute is populated if the change comes from the autocalc code, the value is
-	* lower case, so you must check either BOTH the regular and all lowercase, or just change it to lower case before comparing to be sure
-	*
-	* @dropdownField {string} = fieldname of dropdown, FROM eventInfo.sourceAttribute
-	*/
-	handleDefenseDropdown = function (dropdownField) {
-		//TAS.debug("at handleDefenseDropdown:" + dropdownField);
-		switch (dropdownField.toLowerCase()) {
-			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;
-		}
-	},
+    /*handleDefenseDropdown
+    * All dropdowns in the defense grid: AC, flat footed AC, touch, CMD, flat footed CMD. 
+    * it calls handleNonFFDefenseDropdown for the 3 non flat footed
+    * otherwise it just calls handleDropdown directly.
+    *
+    * NOTE: due to the way eventInfo.sourceAttribute is populated if the change comes from the autocalc code, the value is
+    * lower case, so you must check either BOTH the regular and all lowercase, or just change it to lower case before comparing to be sure
+    *
+    * @dropdownField {string} = fieldname of dropdown, FROM eventInfo.sourceAttribute
+    */
+    handleDefenseDropdown = function (dropdownField) {
+        //TAS.debug("at handleDefenseDropdown:" + dropdownField);
+        switch (dropdownField.toLowerCase()) {
+            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;
+        }
+    },
 
     /*updateConditionDefensePenalty
     * Updates the AC-penalty and CMD-penalty field based on conditions
-	*only difference is CMD penalty affected by energy drain for some reason
+    *only difference is CMD penalty affected by energy drain for some reason
     */
     updateConditionDefensePenalty = function (eventInfo) {
-    	if (!(eventInfo && eventInfo.sourceAttribute === "condition-Drained")) {
-    		updateRowTotal(["AC-penalty"], 0, ["condition-Blinded", "condition-Cowering", "condition-Stunned"
-			, "condition-Flat-Footed", "condition-Pinned", "condition-Wounds"]);
-    	}
-    	updateRowTotal(["CMD-penalty", "condition-Drained"], 0, ["condition-Blinded", "condition-Cowering", "condition-Stunned"
+        if (!(eventInfo && eventInfo.sourceAttribute === "condition-Drained")) {
+            updateRowTotal(["AC-penalty"], 0, ["condition-Blinded", "condition-Cowering", "condition-Stunned"
+            , "condition-Flat-Footed", "condition-Pinned", "condition-Wounds"]);
+        }
+        updateRowTotal(["CMD-penalty", "condition-Drained"], 0, ["condition-Blinded", "condition-Cowering", "condition-Stunned"
         , "condition-Flat-Footed", "condition-Pinned", "condition-Wounds"]);
     },
 
@@ -14540,120 +14563,120 @@ var PFSheet = PFSheet || (function () {
      *
      */
     updateDefenses = function (eventInfo) {
-    	getAttrs(["condition-Flat-Footed", "AC-ability-mod", "FF-DEX", "AC-penalty", "CMD-penalty", "size", "max-dex",
+        getAttrs(["condition-Flat-Footed", "AC-ability-mod", "FF-DEX", "AC-penalty", "CMD-penalty", "size", "max-dex",
             "AC-dodge", "AC-natural", "AC-deflect", "AC-misc", "buff_AC-total", "buff_Touch-total", "buff_CMD-total",
             "CMD-DEX", "FF-CMD-DEX", "CMD-STR", "bab", "CMD-misc",
             "AC", "Touch", "Flat-Footed", "CMD", "FF-CMD", "AC-ability", "FF-ability", "CMD-ability2", "CMD-ability", "AC-armor", "AC-shield",
-			"condition-Blinded", "condition-Pinned", "condition-Stunned", "condition-Cowering", "condition-Drained",
-			"AC-ability-display", "FF-DEX-display", "CMD-DEX-display", "FF-CMD-DEX-display"], function (v) {
-				//TAS.debug("AAAAAAAAAAAAt update defenses");
-				//TAS.debug(v);
-				var setter = {}, setAny = 0,
-					size = parseInt(v["size"], 10) || 0,
-					dodge = parseInt(v["AC-dodge"], 10) || 0,
-					deflect = parseInt(v["AC-deflect"], 10) || 0,
-					miscAC = parseInt(v["AC-misc"], 10) || 0,
-					condPenalty = parseInt(v["AC-penalty"], 10) || 0,
-					buffs = parseInt(v["buff_AC-total"], 10) || 0,
-					buffsTouch = parseInt(v["buff_Touch-total"], 10) || 0,
-					buffsCMD = parseInt(v["buff_CMD-total"], 10) || 0,
-					armor = parseInt(v["AC-armor"], 10) || 0,
-					shield = parseInt(v["AC-shield"], 10) || 0,
-					natural = parseInt(v["AC-natural"], 10) || 0,
-					bab = parseInt(v["bab"], 10) || 0,
-					miscCMD = parseInt(v["CMD-misc"], 10) || 0,
-					maxDex = parseInt(v["max-dex"], 10),
-					ability = parseInt(v["AC-ability-mod"], 10) || 0,
-					ffAbility = parseInt(v["FF-DEX"], 10) || 0,
-					cmdAbility1 = parseInt(v["CMD-STR"], 10) || 0,
-					cmdAbility2 = parseInt(v["CMD-DEX"], 10) || 0,
-					cmdFFAbility2 = parseInt(v["FF-CMD-DEX"], 10) || 0,
-					cmdPenalty = parseInt(v["CMD-penalty"], 10) || 0,
-					blinded = (parseInt(v["condition-Blinded"], 10) || 0) ? 1 : 0,
-					pinned = (parseInt(v["condition-Pinned"], 10) || 0) ? 1 : 0,
-					stunned = (parseInt(v["condition-Stunned"], 10) || 0) ? 1 : 0,
-					ffed = (parseInt(v["condition-Flat-Footed"], 10) || 0) ? 1 : 0,
-					cowering = (parseInt(v["condition-Cowering"], 10) || 0) ? 1 : 0,
-					loseDex = 0;
+            "condition-Blinded", "condition-Pinned", "condition-Stunned", "condition-Cowering", "condition-Drained",
+            "AC-ability-display", "FF-DEX-display", "CMD-DEX-display", "FF-CMD-DEX-display"], function (v) {
+                //TAS.debug("AAAAAAAAAAAAt update defenses");
+                //TAS.debug(v);
+                var setter = {}, setAny = 0,
+                    size = parseInt(v["size"], 10) || 0,
+                    dodge = parseInt(v["AC-dodge"], 10) || 0,
+                    deflect = parseInt(v["AC-deflect"], 10) || 0,
+                    miscAC = parseInt(v["AC-misc"], 10) || 0,
+                    condPenalty = parseInt(v["AC-penalty"], 10) || 0,
+                    buffs = parseInt(v["buff_AC-total"], 10) || 0,
+                    buffsTouch = parseInt(v["buff_Touch-total"], 10) || 0,
+                    buffsCMD = parseInt(v["buff_CMD-total"], 10) || 0,
+                    armor = parseInt(v["AC-armor"], 10) || 0,
+                    shield = parseInt(v["AC-shield"], 10) || 0,
+                    natural = parseInt(v["AC-natural"], 10) || 0,
+                    bab = parseInt(v["bab"], 10) || 0,
+                    miscCMD = parseInt(v["CMD-misc"], 10) || 0,
+                    maxDex = parseInt(v["max-dex"], 10),
+                    ability = parseInt(v["AC-ability-mod"], 10) || 0,
+                    ffAbility = parseInt(v["FF-DEX"], 10) || 0,
+                    cmdAbility1 = parseInt(v["CMD-STR"], 10) || 0,
+                    cmdAbility2 = parseInt(v["CMD-DEX"], 10) || 0,
+                    cmdFFAbility2 = parseInt(v["FF-CMD-DEX"], 10) || 0,
+                    cmdPenalty = parseInt(v["CMD-penalty"], 10) || 0,
+                    blinded = (parseInt(v["condition-Blinded"], 10) || 0) ? 1 : 0,
+                    pinned = (parseInt(v["condition-Pinned"], 10) || 0) ? 1 : 0,
+                    stunned = (parseInt(v["condition-Stunned"], 10) || 0) ? 1 : 0,
+                    ffed = (parseInt(v["condition-Flat-Footed"], 10) || 0) ? 1 : 0,
+                    cowering = (parseInt(v["condition-Cowering"], 10) || 0) ? 1 : 0,
+                    loseDex = 0;
 
-				//TAS.debug("DDDDDDDDDD updateDefenses size:" + size + ", dodge:" + dodge + ", misc:" + miscAC + ", def:" + deflect + ", cond:" + condPenalty + ", buff:" + buffs + ", armor:" + armor + ", shield:" + shield +
-				//  ", natural:"+natural+", bab:"+bab+", miscCMD:"+miscCMD+", maxDex:"+maxDex+", stunned:"+stunned+", ffed:"+ffed+", ability:"+ability+
-				//  ", ffAbility:"+ffAbility+", cmdAbility1:"+cmdAbility1+",cmdAbility2:"+cmdAbility2+", cmdFFAbility2:"+cmdFFAbility2
-				//  + ", blinded: "+blinded+", pinned:"+pinned +", cowering:"+cowering  );
+                //TAS.debug("DDDDDDDDDD updateDefenses size:" + size + ", dodge:" + dodge + ", misc:" + miscAC + ", def:" + deflect + ", cond:" + condPenalty + ", buff:" + buffs + ", armor:" + armor + ", shield:" + shield +
+                //  ", natural:"+natural+", bab:"+bab+", miscCMD:"+miscCMD+", maxDex:"+maxDex+", stunned:"+stunned+", ffed:"+ffed+", ability:"+ability+
+                //  ", ffAbility:"+ffAbility+", cmdAbility1:"+cmdAbility1+",cmdAbility2:"+cmdAbility2+", cmdFFAbility2:"+cmdFFAbility2
+                //  + ", blinded: "+blinded+", pinned:"+pinned +", cowering:"+cowering  );
 
-				maxDex = isNaN(maxDex) ? 99 : maxDex; //cannot do "||0" since 0 is valid but falsy
+                maxDex = isNaN(maxDex) ? 99 : maxDex; //cannot do "||0" since 0 is valid but falsy
 
-				//TAS.debug("maxDex:" + maxDex);
-				if (findAbilityInString(v["AC-ability"]) === "DEX-mod" && maxDex < 99 && maxDex >= 0) {
-					ability = Math.min(ability, maxDex);
-					//TAS.debug("AC-ability is DEX-mod, ability=" + ability);
-				}
-				if (findAbilityInString(v["FF-ability"]) === "DEX-mod" && maxDex < 99 && maxDex >= 0) {
-					ffAbility = Math.min(ffAbility, maxDex);
-					//TAS.debug("FF-ability is DEX-mod, ffAbility=" + ffAbility);
-				}
-				if (findAbilityInString(v["CMD-ability2"]) === "DEX-mod" && maxDex < 99 && maxDex >= 0) {
-					cmdAbility2 = Math.min(cmdAbility2, maxDex);
-					//TAS.debug("CMD-ability2 is DEX-mod, cmdAbility2=" + cmdAbility2);
-				}
-				if (findAbilityInString(v["CMD-ability"]) === "DEX-mod" && maxDex < 99 && maxDex >= 0) {
-					cmdFFAbility2 = Math.min(cmdFFAbility2, maxDex);
-					//TAS.debug("CMD-ability is DEX-mod, cmdFFAbility2=" + cmdFFAbility2);
-				}
-				//lose Dex: you lose your bonus (and dodge) but are not flat footed
-				//Must be applied even if your bonus is not dex :
-				//http://paizo.com/paizo/faq/v5748nruor1fm#v5748eaic9qdi
+                //TAS.debug("maxDex:" + maxDex);
+                if (findAbilityInString(v["AC-ability"]) === "DEX-mod" && maxDex < 99 && maxDex >= 0) {
+                    ability = Math.min(ability, maxDex);
+                    //TAS.debug("AC-ability is DEX-mod, ability=" + ability);
+                }
+                if (findAbilityInString(v["FF-ability"]) === "DEX-mod" && maxDex < 99 && maxDex >= 0) {
+                    ffAbility = Math.min(ffAbility, maxDex);
+                    //TAS.debug("FF-ability is DEX-mod, ffAbility=" + ffAbility);
+                }
+                if (findAbilityInString(v["CMD-ability2"]) === "DEX-mod" && maxDex < 99 && maxDex >= 0) {
+                    cmdAbility2 = Math.min(cmdAbility2, maxDex);
+                    //TAS.debug("CMD-ability2 is DEX-mod, cmdAbility2=" + cmdAbility2);
+                }
+                if (findAbilityInString(v["CMD-ability"]) === "DEX-mod" && maxDex < 99 && maxDex >= 0) {
+                    cmdFFAbility2 = Math.min(cmdFFAbility2, maxDex);
+                    //TAS.debug("CMD-ability is DEX-mod, cmdFFAbility2=" + cmdFFAbility2);
+                }
+                //lose Dex: you lose your bonus (and dodge) but are not flat footed
+                //Must be applied even if your bonus is not dex :
+                //http://paizo.com/paizo/faq/v5748nruor1fm#v5748eaic9qdi
 
-				//blinded: uncanny dodge does not lose dex so set ability to ffAbility in case they have it
-				if (blinded) {
-					loseDex = 1;
-					ability = ffAbility;
-					cmdAbility2 = cmdFFAbility2;
-					if (ability === 0) { dodge = 0; }
-					//TAS.debug("blinded loseDex=" + loseDex + ", ability=" + ability + ", cmdAbility2=" + cmdAbility2);
-				}
+                //blinded: uncanny dodge does not lose dex so set ability to ffAbility in case they have it
+                if (blinded) {
+                    loseDex = 1;
+                    ability = ffAbility;
+                    cmdAbility2 = cmdFFAbility2;
+                    if (ability === 0) { dodge = 0; }
+                    //TAS.debug("blinded loseDex=" + loseDex + ", ability=" + ability + ", cmdAbility2=" + cmdAbility2);
+                }
 
-				//Uncanny dodge still loses dex in these conditions, so set both to 0
-				if (pinned || cowering || stunned) {
-					loseDex = 1;
-					ffAbility = Math.min(0, ffAbility);
-					ability = ffAbility;
-					cmdFFAbility2 = Math.min(0, cmdFFAbility2);
-					cmdAbility2 = cmdFFAbility2;
-					dodge = 0;
-					//TAS.debug("pinned, cowering, or stunned loseDex=" + loseDex + ", ffAbility=" + ffAbility + ", ability=" + ability + ", cmdFFAbility2=" + cmdFFAbility2 + ", cmdAbility2=" + cmdAbility2 + ", dodge=" + dodge);
-				}
+                //Uncanny dodge still loses dex in these conditions, so set both to 0
+                if (pinned || cowering || stunned) {
+                    loseDex = 1;
+                    ffAbility = Math.min(0, ffAbility);
+                    ability = ffAbility;
+                    cmdFFAbility2 = Math.min(0, cmdFFAbility2);
+                    cmdAbility2 = cmdFFAbility2;
+                    dodge = 0;
+                    //TAS.debug("pinned, cowering, or stunned loseDex=" + loseDex + ", ffAbility=" + ffAbility + ", ability=" + ability + ", cmdFFAbility2=" + cmdFFAbility2 + ", cmdAbility2=" + cmdAbility2 + ", dodge=" + dodge);
+                }
 
-				var ac = 10 + armor + shield + natural + size + dodge + ability + deflect + miscAC + condPenalty + buffs;
-				var touch = 10 + size + dodge + ability + deflect + miscAC + condPenalty + buffsTouch;
-				var ff = 10 + armor + shield + natural + size + ffAbility + deflect + miscAC + condPenalty + buffs + (ffAbility > 0 ? dodge : 0);
-				var cmd = 10 + bab + cmdAbility1 + cmdAbility2 + (-1 * size) + dodge + deflect + miscCMD + cmdPenalty + buffsCMD;
-				var cmdFF = 10 + bab + cmdAbility1 + cmdFFAbility2 + (-1 * size) + deflect + miscCMD + cmdPenalty + buffsCMD + (cmdFFAbility2 > 0 ? dodge : 0);
+                var ac = 10 + armor + shield + natural + size + dodge + ability + deflect + miscAC + condPenalty + buffs;
+                var touch = 10 + size + dodge + ability + deflect + miscAC + condPenalty + buffsTouch;
+                var ff = 10 + armor + shield + natural + size + ffAbility + deflect + miscAC + condPenalty + buffs + (ffAbility > 0 ? dodge : 0);
+                var cmd = 10 + bab + cmdAbility1 + cmdAbility2 + (-1 * size) + dodge + deflect + miscCMD + cmdPenalty + buffsCMD;
+                var cmdFF = 10 + bab + cmdAbility1 + cmdFFAbility2 + (-1 * size) + deflect + miscCMD + cmdPenalty + buffsCMD + (cmdFFAbility2 > 0 ? dodge : 0);
 
-				//TAS.debug("ac=" + ac + ", touch=" + touch + ", ff=" + ff + ", cmd=" + cmd + ", cmdFF=" + cmdFF);
-				var currAC = parseInt(v["AC"], 10);
-				var currTouch = parseInt(v["Touch"], 10);
-				var currFF = parseInt(v["Flat-Footed"], 10);
-				var currCMD = parseInt(v["CMD"], 10);
-				var currCMDFF = parseInt(v["FF-CMD"], 10);
+                //TAS.debug("ac=" + ac + ", touch=" + touch + ", ff=" + ff + ", cmd=" + cmd + ", cmdFF=" + cmdFF);
+                var currAC = parseInt(v["AC"], 10);
+                var currTouch = parseInt(v["Touch"], 10);
+                var currFF = parseInt(v["Flat-Footed"], 10);
+                var currCMD = parseInt(v["CMD"], 10);
+                var currCMDFF = parseInt(v["FF-CMD"], 10);
 
-				//TAS.debug("currAC=" + currAC + ", currTouch=" + currTouch + ", currFF=" + currFF + ", currCMD=" + currCMD + ", currCMDFF=" + currCMDFF);
-				//default 10
-				if (ac !== currAC || isNaN(currAC)) { setter["AC"] = ac; setAny += 1; }
-				if (touch !== currTouch || isNaN(currTouch)) { setter["Touch"] = touch; setAny += 1; }
-				if (ff !== currFF || isNaN(currFF)) { setter["Flat-Footed"] = ff; setAny += 1; }
-				if (cmd !== currCMD || isNaN(currCMD)) { setter["CMD"] = cmd; setAny += 1; }
-				if (cmdFF !== currCMDFF || isNaN(currCMDFF)) { setter["FF-CMD"] = cmdFF; setAny += 1; }
-				//default 0
-				if (ability !== (parseInt(v["AC-ability-display"], 10))) { setter["AC-ability-display"] = ability; setAny += 1; }
-				if (ffAbility !== (parseInt(v["FF-DEX-display"], 10))) { setter["FF-DEX-display"] = ffAbility; setAny += 1; }
-				if (cmdAbility2 !== (parseInt(v["CMD-DEX-display"], 10))) { setter["CMD-DEX-display"] = cmdAbility2; setAny += 1; }
-				if (cmdFFAbility2 !== (parseInt(v["FF-CMD-DEX-display"], 10))) { setter["FF-CMD-DEX-display"] = cmdFFAbility2; setAny += 1; }
-				if (setAny) {
-					setAttrs(setter);
-				}
+                //TAS.debug("currAC=" + currAC + ", currTouch=" + currTouch + ", currFF=" + currFF + ", currCMD=" + currCMD + ", currCMDFF=" + currCMDFF);
+                //default 10
+                if (ac !== currAC || isNaN(currAC)) { setter["AC"] = ac; setAny += 1; }
+                if (touch !== currTouch || isNaN(currTouch)) { setter["Touch"] = touch; setAny += 1; }
+                if (ff !== currFF || isNaN(currFF)) { setter["Flat-Footed"] = ff; setAny += 1; }
+                if (cmd !== currCMD || isNaN(currCMD)) { setter["CMD"] = cmd; setAny += 1; }
+                if (cmdFF !== currCMDFF || isNaN(currCMDFF)) { setter["FF-CMD"] = cmdFF; setAny += 1; }
+                //default 0
+                if (ability !== (parseInt(v["AC-ability-display"], 10))) { setter["AC-ability-display"] = ability; setAny += 1; }
+                if (ffAbility !== (parseInt(v["FF-DEX-display"], 10))) { setter["FF-DEX-display"] = ffAbility; setAny += 1; }
+                if (cmdAbility2 !== (parseInt(v["CMD-DEX-display"], 10))) { setter["CMD-DEX-display"] = cmdAbility2; setAny += 1; }
+                if (cmdFFAbility2 !== (parseInt(v["FF-CMD-DEX-display"], 10))) { setter["FF-CMD-DEX-display"] = cmdFFAbility2; setAny += 1; }
+                if (setAny) {
+                    setAttrs(setter);
+                }
 
-			});
+            });
     },
 
 
@@ -14669,118 +14692,118 @@ var PFSheet = PFSheet || (function () {
                 attribList.push(row + "-" + column);
             });
         });
-		getAttrs(attribList, function (v) {
-			//TAS.debug("updateArmor", v);
-        	var acp = 0, maxDex = 99, acA = 0, acS = 0, sp = 0, atk = 0
-			   , subAC = 0, subD = 0, subAcp = 0, nonProf = 0, subsp = 0
-			   , currACP = 0, currMaxDex = 99, currACArmor = 0, currACShield = 0, currSpellFail = 0, currAtkMod = 0
-			   , maxDexDropdown = parseInt(v["max-dex-source"], 10) || 0
-			   , acpDropdown = parseInt(v["acp-source"], 10)
-			   , setAny = 0
-			   , currentLoad = parseInt(v["current-load"], 10) || 0
-			   , setter = {}
-        	;
+        getAttrs(attribList, function (v) {
+            //TAS.debug("updateArmor", v);
+            var acp = 0, maxDex = 99, acA = 0, acS = 0, sp = 0, atk = 0
+               , subAC = 0, subD = 0, subAcp = 0, nonProf = 0, subsp = 0
+               , currACP = 0, currMaxDex = 99, currACArmor = 0, currACShield = 0, currSpellFail = 0, currAtkMod = 0
+               , maxDexDropdown = parseInt(v["max-dex-source"], 10) || 0
+               , acpDropdown = parseInt(v["acp-source"], 10)
+               , setAny = 0
+               , currentLoad = parseInt(v["current-load"], 10) || 0
+               , setter = {}
+            ;
 
             defenseArmorShieldRows.forEach(function (row) {
-			    if (v[row + "-equipped"] == "1") {
-				    subAC = parseInt(v[row + "-acbonus"], 10) || 0;
-				    subD = parseInt(v[row + "-max-dex"], 10); subD = isNaN(subD) ? 99 : subD; //cannot do "or 0" since 0 is valid but falsy
-				    subAcp = parseInt(v[row + "-acp"], 10) || 0;
-				    nonProf = parseInt(v[row + "-proficiency"], 10) || 0;//assume proficient 0 is messing with it //prof=isNaN(prof)?0:prof;//cannot do "||0" since 0 is valid but falsy
-				    subsp = parseInt(v[row + "-spell-fail"], 10) || 0;
-					if (row.indexOf("armor") >= 0){
-						acA += subAC;
-					} else {
-						acS += subAC;
-					}
-					maxDex = Math.min(subD, maxDex);
-					acp += subAcp;
-					sp += subsp;
-					if (nonProf) { atk += subAcp; }
-					//TAS.debug("row=" + row + ", subAC=" + subAC + ", subD=" + subD + ", subAcp=" + subAcp + ", nonProf=" + nonProf + ", subsp=" + subsp + ", acA=" + acA + ", maxDex=" + maxDex + ", acp=" + acp + ", sp=" + sp + ", atk=" + atk);
-				}
-			});
+                if (v[row + "-equipped"] == "1") {
+                    subAC = parseInt(v[row + "-acbonus"], 10) || 0;
+                    subD = parseInt(v[row + "-max-dex"], 10); subD = isNaN(subD) ? 99 : subD; //cannot do "or 0" since 0 is valid but falsy
+                    subAcp = parseInt(v[row + "-acp"], 10) || 0;
+                    nonProf = parseInt(v[row + "-proficiency"], 10) || 0;//assume proficient 0 is messing with it //prof=isNaN(prof)?0:prof;//cannot do "||0" since 0 is valid but falsy
+                    subsp = parseInt(v[row + "-spell-fail"], 10) || 0;
+                    if (row.indexOf("armor") >= 0){
+                        acA += subAC;
+                    } else {
+                        acS += subAC;
+                    }
+                    maxDex = Math.min(subD, maxDex);
+                    acp += subAcp;
+                    sp += subsp;
+                    if (nonProf) { atk += subAcp; }
+                    //TAS.debug("row=" + row + ", subAC=" + subAC + ", subD=" + subD + ", subAcp=" + subAcp + ", nonProf=" + nonProf + ", subsp=" + subsp + ", acA=" + acA + ", maxDex=" + maxDex + ", acp=" + acp + ", sp=" + sp + ", atk=" + atk);
+                }
+            });
 
-        	// #0: Armor, Shield & Load
-        	// #1: Armor & Shield only
-        	// #2: Load only
-        	// #3: None
-        	if (maxDexDropdown == 0 || maxDexDropdown == 2) {
-        		if (maxDexDropdown == 2) { maxDex = 99; }
+            // #0: Armor, Shield & Load
+            // #1: Armor & Shield only
+            // #2: Load only
+            // #3: None
+            if (maxDexDropdown == 0 || maxDexDropdown == 2) {
+                if (maxDexDropdown == 2) { maxDex = 99; }
 
-        		//carry capacity / encumbrance / load affect on max dex
-        		//TAS.debug("currentLoad=" + currentLoad);
-        		if (currentLoad == 1) { // under medium encumbrance load
-        			maxDex = Math.min(maxDex, 3);
-        			//TAS.debug("medium load adjusted maxDex=" + maxDex);
-        		} else if (currentLoad == 2) { // under heavy encumbrance load
-        			maxDex = Math.min(maxDex, 1);
-        			//TAS.debug("heavy load adjusted maxDex=" + maxDex);
-        		}
-        	} else if (maxDexDropdown == 3) {
-        		maxDex = 99;
-        	}
+                //carry capacity / encumbrance / load affect on max dex
+                //TAS.debug("currentLoad=" + currentLoad);
+                if (currentLoad == 1) { // under medium encumbrance load
+                    maxDex = Math.min(maxDex, 3);
+                    //TAS.debug("medium load adjusted maxDex=" + maxDex);
+                } else if (currentLoad == 2) { // under heavy encumbrance load
+                    maxDex = Math.min(maxDex, 1);
+                    //TAS.debug("heavy load adjusted maxDex=" + maxDex);
+                }
+            } else if (maxDexDropdown == 3) {
+                maxDex = 99;
+            }
 
-        	// #0: Armor, Shield & Load
-        	// #1: Armor & Shield only
-        	// #2: Load only
-        	// #3: None
-        	if (acpDropdown == 0 || acpDropdown == 2) {
-        		if (acpDropdown == 2) { acp = 0; }
+            // #0: Armor, Shield & Load
+            // #1: Armor & Shield only
+            // #2: Load only
+            // #3: None
+            if (acpDropdown == 0 || acpDropdown == 2) {
+                if (acpDropdown == 2) { acp = 0; }
 
-        		//carry capacity / encumbrance / load affect on max dex
-        		//TAS.debug("currentLoad=" + currentLoad);
-        		if (currentLoad == 1) { // under medium encumbrance load
-        			acp -= 3;
-        			//TAS.debug("medium load adjusted acp=" + acp);
-        		} else if (currentLoad == 2) { // under heavy encumbrance load
-        			acp -= 6;
-        			//TAS.debug("heavy load adjusted acp=" + acp);
-        		}
-        	} else if (acpDropdown == 3) {
-        		acp = 0;
-        	}
+                //carry capacity / encumbrance / load affect on max dex
+                //TAS.debug("currentLoad=" + currentLoad);
+                if (currentLoad == 1) { // under medium encumbrance load
+                    acp -= 3;
+                    //TAS.debug("medium load adjusted acp=" + acp);
+                } else if (currentLoad == 2) { // under heavy encumbrance load
+                    acp -= 6;
+                    //TAS.debug("heavy load adjusted acp=" + acp);
+                }
+            } else if (acpDropdown == 3) {
+                acp = 0;
+            }
 
-        	currACP = parseInt(v.acp, 10) || 0;
-        	currMaxDex = parseInt(v["max-dex"], 10);//cannot do "||0" since 0 is valid but falsy
-        	//TAS.debug("currMaxDex:" + currMaxDex);
-        	currMaxDex = isNaN(currMaxDex) ? 99 : currMaxDex;
+            currACP = parseInt(v.acp, 10) || 0;
+            currMaxDex = parseInt(v["max-dex"], 10);//cannot do "||0" since 0 is valid but falsy
+            //TAS.debug("currMaxDex:" + currMaxDex);
+            currMaxDex = isNaN(currMaxDex) ? 99 : currMaxDex;
 
-        	currACArmor = parseInt(v["AC-armor"], 10) || 0;
-        	currACShield = parseInt(v["AC-shield"], 10) || 0;
-        	currSpellFail = parseInt(v["spell-fail"], 10) || 0;
-        	currAtkMod = parseInt(v["acp-attack-mod"], 10) || 0;
+            currACArmor = parseInt(v["AC-armor"], 10) || 0;
+            currACShield = parseInt(v["AC-shield"], 10) || 0;
+            currSpellFail = parseInt(v["spell-fail"], 10) || 0;
+            currAtkMod = parseInt(v["acp-attack-mod"], 10) || 0;
 
-        	//TAS.debug(v);
-        	//TAS.debug("curr atk mod:" + currAtkMod + ", curr acp:" + currACP + ", new acp:" + acp + ", currMaxDex:" + currMaxDex + ", new maxdex:" + maxDex);
+            //TAS.debug(v);
+            //TAS.debug("curr atk mod:" + currAtkMod + ", curr acp:" + currACP + ", new acp:" + acp + ", currMaxDex:" + currMaxDex + ", new maxdex:" + maxDex);
 
-        	if (currACP !== acp) { setter["acp"] = acp; setAny = 1; }
-        	if (currMaxDex !== maxDex) { setter["max-dex"] = maxDex; setAny = 1; }
-        	if (currACArmor !== acA) { setter["AC-armor"] = acA; setAny = 1; }
-        	if (currACShield !== acS) { setter["AC-shield"] = acS; setAny = 1; }
-        	if (currSpellFail !== sp) { setter["spell-fail"] = sp; setAny = 1; }
-        	if (currAtkMod !== atk) { setter["acp-attack-mod"] = atk; setAny = 1; }
-        	if (setAny) {
-        		setAttrs(setter);
-        	}
+            if (currACP !== acp) { setter["acp"] = acp; setAny = 1; }
+            if (currMaxDex !== maxDex) { setter["max-dex"] = maxDex; setAny = 1; }
+            if (currACArmor !== acA) { setter["AC-armor"] = acA; setAny = 1; }
+            if (currACShield !== acS) { setter["AC-shield"] = acS; setAny = 1; }
+            if (currSpellFail !== sp) { setter["spell-fail"] = sp; setAny = 1; }
+            if (currAtkMod !== atk) { setter["acp-attack-mod"] = atk; setAny = 1; }
+            if (setAny) {
+                setAttrs(setter);
+            }
         });
     },
 
-	/*updateConditionsSavePenalty
-	*  applies conditions to saves.
-	*/
+    /*updateConditionsSavePenalty
+    *  applies conditions to saves.
+    */
     updateConditionsSavePenalty = function () {
-    	getAttrs(["condition-Fear", "condition-Sickened", "condition-Drained", "condition-Wounds", "saves-cond"], function (v) {
-    		var fear = parseInt(v["condition-Fear"], 10) || 0,
+        getAttrs(["condition-Fear", "condition-Sickened", "condition-Drained", "condition-Wounds", "saves-cond"], function (v) {
+            var fear = parseInt(v["condition-Fear"], 10) || 0,
                 sickened = parseInt(v["condition-Sickened"], 10) || 0,
                 drained = parseInt(v["condition-Drained"], 10) || 0,
                 wounds = parseInt(v["condition-Wounds"], 10) || 0,
                 currCond = parseInt(v["saves-cond"], 10) || 0;
-    		var newCond = drained - fear - sickened - wounds;
-    		if (currCond !== newCond) {
-    			setAttrs({ "saves-cond": newCond });
-    		}
-    	});
+            var newCond = drained - fear - sickened - wounds;
+            if (currCond !== newCond) {
+                setAttrs({ "saves-cond": newCond });
+            }
+        });
     },
 
     /* updateSave
@@ -14788,43 +14811,43 @@ var PFSheet = PFSheet || (function () {
     * @save = type of save: Fort, Ref, Will  (first character capitalized)
     */
     updateSave = function (save) {
-    	updateRowTotal([save, "total-" + save, save + "-ability-mod", save + "-trait", save + "-enhance", save + "-resist", save + "-misc", "saves-cond", "buff_" + save + "-total"]);
+        updateRowTotal([save, "total-" + save, save + "-ability-mod", save + "-trait", save + "-enhance", save + "-resist", save + "-misc", "saves-cond", "buff_" + save + "-total"]);
     },
 
 
-	/************************************* ATTACKS PAGE ***********************************/
+    /************************************* ATTACKS PAGE ***********************************/
 
-	/********* TOP GRID **********/
-	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" }
-	},
+    /********* TOP GRID **********/
+    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" }
+    },
 
-	/* updates notes for damage row of grid
-	* sets reminder on @{DMG-cnote} to increase the damage die if size changes.
-	* CB: DO WE REALLY NEED THIS? IT DOESN'T GET REMOVED IF THEY DO SO IT"S PRETTY USLESS
-	* Plus it's not even in the rolltable. so safe to remove 
-	*/
-	updateDamageNote = function (size, currsize) {
-		getAttrs(["DMG-cnote"], function (v) {
-			var note = "";
-			if (size < currsize) {
-     			note = "Increase damage die";
-			} else if (size > currsize) {
-     			note = "Decrease damage die";
-     		}
-     		if (v["DMG-cnote"] !== note) {
-     			setAttrs({ "DMG-cnote": note });
-     		}
-     	});
+    /* updates notes for damage row of grid
+    * sets reminder on @{DMG-cnote} to increase the damage die if size changes.
+    * CB: DO WE REALLY NEED THIS? IT DOESN'T GET REMOVED IF THEY DO SO IT"S PRETTY USLESS
+    * Plus it's not even in the rolltable. so safe to remove 
+    */
+    updateDamageNote = function (size, currsize) {
+        getAttrs(["DMG-cnote"], function (v) {
+            var note = "";
+            if (size < currsize) {
+                note = "Increase damage die";
+            } else if (size > currsize) {
+                note = "Decrease damage die";
+            }
+            if (v["DMG-cnote"] !== note) {
+                setAttrs({ "DMG-cnote": note });
+            }
+        });
      },
 
-	 /* updateDamage - conditions and buffs
+     /* updateDamage - conditions and buffs
       * calculates damage mod in top grid
-	*/
+    */
      updateDamage = function () {
-     	updateRowTotal(["DMG-mod", "buff_DMG-total"], 0, ["condition-Sickened"]);
+        updateRowTotal(["DMG-mod", "buff_DMG-total"], 0, ["condition-Sickened"]);
      },
 
     /* updateConditionAttackPenalty
@@ -14832,319 +14855,324 @@ var PFSheet = PFSheet || (function () {
      * updates the attk-penalty for attacks based on conditions (including wearing armor you are not proficient in)
      */
     updateConditionAttackPenalty = function () {
-    	var adds = ["attk-penalty", "condition-Invisible", "acp-attack-mod", "condition-Drained"]
+        var adds = ["attk-penalty", "condition-Invisible", "acp-attack-mod", "condition-Drained"]
             , subtracts = ["condition-Dazzled", "condition-Entangled", "condition-Grappled"
             , "condition-Fear", "condition-Sickened", "condition-Prone"
             , "condition-Wounds"];
-    	updateRowTotal(adds, 0, subtracts);
+        updateRowTotal(adds, 0, subtracts);
     },
 
-	/* updates notes for attack grid
-	*/
+    /* updates notes for attack grid
+    */
     updateConditionAttackNote = function () {
-    	getAttrs(["condition-Grappled", "condition-Invisible"], function (v) {
-    		var setter = {}, setAny = 0, gnote, cnote;
-    		if (v["condition-Grappled"] != "0") {
-    			gnote = "+" + v["condition-Grappled"] + " grapple";
-    		}
-    		if (v["condition-Invisible"] != "0") {
-    			cnote = "vs sighted, +ignore dex";
-    		}
-    		if (!(!v["attk-CMB-cnote"] && !gnote) && v["attk-CMB-cnote"] !== gnote) {
-    			setter["attk-CMB-cnote"] = gnote;
-    			setAny = 1;
-    		}
-    		if (!(!v["attk-cnote"] && !cnote) && v["attk-cnote"] !== cnote) {
-    			setter["attk-cnote"] = cnote;
-    			setAny = 1;
-    		}
-    		if (setAny) {
-    			setAttrs(setter);
-    		}
-    	});
+        getAttrs(["condition-Grappled", "condition-Invisible"], function (v) {
+            var setter = {}, setAny = 0, gnote, cnote;
+            if (v["condition-Grappled"] != "0") {
+                gnote = "+" + v["condition-Grappled"] + " grapple";
+            }
+            if (v["condition-Invisible"] != "0") {
+                cnote = "vs sighted, +ignore dex";
+            }
+            if (!(!v["attk-CMB-cnote"] && !gnote) && v["attk-CMB-cnote"] !== gnote) {
+                setter["attk-CMB-cnote"] = gnote;
+                setAny = 1;
+            }
+            if (!(!v["attk-cnote"] && !cnote) && v["attk-cnote"] !== cnote) {
+                setter["attk-cnote"] = cnote;
+                setAny = 1;
+            }
+            if (setAny) {
+                setAttrs(setter);
+            }
+        });
     },
 
 
     /* updateAttack - updates one row of attack grid,
      * Updates the attack type totals at top of attack page for one row of grid
      *
-	* @attype = the type of attack: Melee, Ranged, CMB  IS CASE SENSITIVE
+    * @attype = the type of attack: Melee, Ranged, CMB  IS CASE SENSITIVE
      */
-	updateAttack = function (attype, eventInfo) {
-		if (eventInfo && eventInfo.sourceAttribute.toLowerCase() === "buff_melee-total") {
-			updateAttack("CMB");
-		}
-		updateRowTotal([attackGridFields[attype].atk, "bab", "attk-penalty"
-			, attackGridFields[attype].abilityMod, attackGridFields[attype].misc
-			, attackGridFields[attype].size, attackGridFields[attype].buff]);
-	},
+    updateAttack = function (attype, eventInfo) {
+        if (eventInfo && eventInfo.sourceAttribute.toLowerCase() === "buff_melee-total") {
+            updateAttack("CMB");
+        }
+        updateRowTotal([attackGridFields[attype].atk, "bab", "attk-penalty"
+            , attackGridFields[attype].abilityMod, attackGridFields[attype].misc
+            , attackGridFields[attype].size, attackGridFields[attype].buff]);
+    },
 
-	/****** Attack and Damage Effect section ********/
-	/* handles the attacks effects row 
-	*/
+    /****** Attack and Damage Effect section ********/
+    /* handles the attacks effects row 
+    */
     updateAttackEffectTotals = function () {
-    	getAttrs(["attk-effect-total",
+        getAttrs(["attk-effect-total",
             "attk-effect_mod_1", "attk-effect_mod_1_Toggle", "attk-effect_mod_2", "attk-effect_mod_2_Toggle",
             "attk-effect_mod_3", "attk-effect_mod_3_Toggle", "attk-effect_mod_4", "attk-effect_mod_4_Toggle"], function (v) {
-            	var attkEffectTot = ((v["attk-effect_mod_1_Toggle"] == "1") ? (parseInt(v["attk-effect_mod_1"], 10) || 0) : 0) +
-					((v["attk-effect_mod_2_Toggle"] == "1") ? (parseInt(v["attk-effect_mod_2"], 10) || 0) : 0) +
-					((v["attk-effect_mod_3_Toggle"] == "1") ? (parseInt(v["attk-effect_mod_3"], 10) || 0) : 0) +
-					((v["attk-effect_mod_4_Toggle"] == "1") ? (parseInt(v["attk-effect_mod_4"], 10) || 0) : 0),
-				currAttk = parseInt(v["attk-effect-total"], 10) || 0,
-				setters = {};
-            	if (isNaN(currAttk) || currAttk !== attkEffectTot) {
-            		setters["attk-effect-total"] = attkEffectTot;
-            		setAttrs(setters);
-            	}
+                var attkEffectTot = ((v["attk-effect_mod_1_Toggle"] == "1") ? (parseInt(v["attk-effect_mod_1"], 10) || 0) : 0) +
+                    ((v["attk-effect_mod_2_Toggle"] == "1") ? (parseInt(v["attk-effect_mod_2"], 10) || 0) : 0) +
+                    ((v["attk-effect_mod_3_Toggle"] == "1") ? (parseInt(v["attk-effect_mod_3"], 10) || 0) : 0) +
+                    ((v["attk-effect_mod_4_Toggle"] == "1") ? (parseInt(v["attk-effect_mod_4"], 10) || 0) : 0),
+                currAttk = parseInt(v["attk-effect-total"], 10) || 0,
+                setters = {};
+                if (isNaN(currAttk) || currAttk !== attkEffectTot) {
+                    setters["attk-effect-total"] = attkEffectTot;
+                    setAttrs(setters);
+                }
             });
     },
 
-	/* handles the damage effects row 
-	*/
+    /* handles the damage effects row 
+    */
     updateDMGEffectTotals = function () {
-    	getAttrs(["dmg-effect-total",
+        getAttrs(["dmg-effect-total",
             "dmg-effect_mod_1", "dmg-effect_mod_1_Toggle", "dmg-effect_mod_2", "dmg-effect_mod_2_Toggle",
             "dmg-effect_mod_3", "dmg-effect_mod_3_Toggle", "dmg-effect_mod_4", "dmg-effect_mod_4_Toggle"], function (v) {
-            	var dmgEffectTot = ((v["dmg-effect_mod_1_Toggle"] == "1") ? (parseInt(v["dmg-effect_mod_1"], 10) || 0) : 0) +
-					((v["dmg-effect_mod_2_Toggle"] == "1") ? (parseInt(v["dmg-effect_mod_2"], 10) || 0) : 0) +
-					((v["dmg-effect_mod_3_Toggle"] == "1") ? (parseInt(v["dmg-effect_mod_3"], 10) || 0) : 0) +
-					((v["dmg-effect_mod_4_Toggle"] == "1") ? (parseInt(v["dmg-effect_mod_4"], 10) || 0) : 0),
-				currDmg = parseInt(v["dmg-effect-total"], 10) || 0,
-				setters = {};
-            	if (isNaN(currDmg) || currDmg !== dmgEffectTot) {
-            		setters["dmg-effect-total"] = dmgEffectTot;
-            		setAttrs(setters);
-            	}
+                var dmgEffectTot = ((v["dmg-effect_mod_1_Toggle"] == "1") ? (parseInt(v["dmg-effect_mod_1"], 10) || 0) : 0) +
+                    ((v["dmg-effect_mod_2_Toggle"] == "1") ? (parseInt(v["dmg-effect_mod_2"], 10) || 0) : 0) +
+                    ((v["dmg-effect_mod_3_Toggle"] == "1") ? (parseInt(v["dmg-effect_mod_3"], 10) || 0) : 0) +
+                    ((v["dmg-effect_mod_4_Toggle"] == "1") ? (parseInt(v["dmg-effect_mod_4"], 10) || 0) : 0),
+                currDmg = parseInt(v["dmg-effect-total"], 10) || 0,
+                setters = {};
+                if (isNaN(currDmg) || currDmg !== dmgEffectTot) {
+                    setters["dmg-effect-total"] = dmgEffectTot;
+                    setAttrs(setters);
+                }
             });
     },
 
 
-	/***********  REPEATING WEAPON FIELDSET *********/
-	/*handleRepeatingAttackDropdown
-	*/
+    /***********  REPEATING WEAPON FIELDSET *********/
+    /*handleRepeatingAttackDropdown
+    */
     handleRepeatingAttackDropdown = function (id, eventInfo) {
-    	var idStr = getRepeatingIDStr(id), prefix = "repeating_weapon_" + idStr;
-    	//TAS.debug("TRACE:handleRepeatingAttackDropdown id:" + id + ", eventInfo is");
-    	//TAS.debug(eventInfo);
-    	//TAS.debug("TRACE end");
-    	if (isBadRowId("weapon", id, true)) {
-    		TAS.error("handleRepeatingAttackDropdown, invalid id:" + id);
-    		return;
-    	}
-    	handleDropdown(prefix + "attack-type", prefix + "attack-type-mod");
+        var idStr = getRepeatingIDStr(id), prefix = "repeating_weapon_" + idStr;
+        //TAS.debug("TRACE:handleRepeatingAttackDropdown id:" + id + ", eventInfo is");
+        //TAS.debug(eventInfo);
+        //TAS.debug("TRACE end");
+        if (isBadRowId("weapon", id, true)) {
+            TAS.error("handleRepeatingAttackDropdown, invalid id:" + id);
+            return;
+        }
+        handleDropdown(prefix + "attack-type", prefix + "attack-type-mod");
     },
 
     /* handleRepeatingDamageDropdown
-	* this is a special case of dropdown, because it contains a possible multiplier Damage ability dropdown.
+    * this is a special case of dropdown, because it contains a possible multiplier Damage ability dropdown.
     * better to split this into two
     */
     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)) {
-    		TAS.error("handleRepeatingDamageDropdown, invalid id:" + id);
-    		return;
-    	}
-    	getAttrs([readField, writeField], function (v) {
-    		var ability = findAbilityInString(v[readField]),
+        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)) {
+            TAS.error("handleRepeatingDamageDropdown, invalid id:" + id);
+            return;
+        }
+        getAttrs([readField, writeField], function (v) {
+            var ability = findAbilityInString(v[readField]),
                 mult = findMultiplier(v[readField]);
-    		getAttrs([ability], function (v2) {
-    			var basemod = parseInt(v2[ability], 10) || 0;
-    			var dmgmod = Math.floor(basemod * mult);
-    			var currentmod = parseInt(v[writeField], 10) || 0;
-    			var setter = {};
-    			if (dmgmod !== currentmod) {
-    				setter[writeField] = dmgmod;
-    				setAttrs(setter);
-    				//short circuit 
-    				//updateRepeatingWeaponDamage(id,"damage-ability-mod",value);
-    			}
-    		});
-    	});
+            getAttrs([ability], function (v2) {
+                var basemod = parseInt(v2[ability], 10) || 0;
+                var dmgmod = Math.floor(basemod * mult);
+                var currentmod = parseInt(v[writeField], 10) || 0;
+                var setter = {};
+                if (dmgmod !== currentmod) {
+                    setter[writeField] = dmgmod;
+                    setAttrs(setter);
+                    //short circuit 
+                    //updateRepeatingWeaponDamage(id,"damage-ability-mod",value);
+                }
+            });
+        });
     },
 
-	/* updateRepeatingWeaponAttack - calculates total-attack
-	* also updates attk-effect-total-copy
-	* @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 - calculates total-attack
+    * also updates attk-effect-total-copy
+    * @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"
-    	;
+        //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)) {
-    		TAS.error("updateRepeatingWeaponAttack, invalid id:" + id);
-    		return;
-    	}
+        if (isBadRowId("weapon", id, true)) {
+            TAS.error("updateRepeatingWeaponAttack, invalid id:" + id);
+            return;
+        }
 
 
-    	getAttrs([enhanceField, mwkField, attkTypeModField, attkEffectField, attkEffectCopyField, profField, attkMacroModField, totalAttackField], function (v) {
-    		var enhance = (parseInt(v[enhanceField], 10) || 0)
+        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)
+                , 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;
+                , 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, { silent: true }); }
-    	});
+            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, { silent: true }); }
+        });
     },
 
-	/* loops trough all rows and calls updateRepeatingWeaponAttack */
+    /* loops trough all rows and calls updateRepeatingWeaponAttack */
     updateRepeatingWeaponAttacks = function (eventInfo) {
-    	getSectionIDs("repeating_weapon", function (ids) {
-    		ids.forEach(function (id, index) {
-    			updateRepeatingWeaponAttack(id, eventInfo);
-    		});
-    	});
+        getSectionIDs("repeating_weapon", function (ids) {
+            ids.forEach(function (id, index) {
+                updateRepeatingWeaponAttack(id, eventInfo);
+            });
+        });
     },
 
-	/* updateRepeatingWeaponDamage - updates total-damage
-	* also updates  dmg-effect-total-copy and DMG-mod-copy
-	*/
+    /* updateRepeatingWeaponDamage - updates total-damage
+    * also updates  dmg-effect-total-copy and DMG-mod-copy
+    */
     updateRepeatingWeaponDamage = function (id, eventInfo) {
-    	var idStr = getRepeatingIDStr(id),
+        var idStr = getRepeatingIDStr(id),
             maxname = "repeating_weapon_" + idStr + "damage-ability-max",
             modname = "repeating_weapon_" + idStr + "damage-ability-mod",
-			dmgEffectCopy = "repeating_weapon_" + idStr + "dmg-effect-total-copy",
-			dmgModCopy = "repeating_weapon_" + idStr + "DMG-mod-copy";
-    	if (isBadRowId("weapon", id, true)) {
-    		TAS.error("updateRepeatingWeaponDamage, invalid id:" + id);
-    		return;
-    	}
-    	getAttrs([maxname, modname, dmgEffectCopy, dmgModCopy, "dmg-effect-total", "DMG-mod"], function (v) {
-    		var dmgFields, setter = {}, setAny = 0,
+            dmgEffectCopy = "repeating_weapon_" + idStr + "dmg-effect-total-copy",
+            dmgModCopy = "repeating_weapon_" + idStr + "DMG-mod-copy";
+        if (isBadRowId("weapon", id, true)) {
+            TAS.error("updateRepeatingWeaponDamage, invalid id:" + id);
+            return;
+        }
+        getAttrs([maxname, modname, dmgEffectCopy, dmgModCopy, "dmg-effect-total", "DMG-mod"], function (v) {
+            var dmgFields, setter = {}, setAny = 0,
                 max = parseInt(v[maxname], 10) || 0,
                 mod = parseInt(v[modname], 10) || 0,
-				dmgEffect = (parseInt(v["dmg-effect-total"], 10) || 0),
-				dmgMod = (parseInt(v["DMG-mod"], 10) || 0),
-				currDmgEffect = (parseInt(v[dmgEffectCopy], 10) || 0),
-				currDmgMod = (parseInt(v[dmgModCopy], 10) || 0);
-    		if (max <= 0) { max = 9999; }
-    		mod = Math.min(max, mod) + dmgEffect + dmgMod;
+                dmgEffect = (parseInt(v["dmg-effect-total"], 10) || 0),
+                dmgMod = (parseInt(v["DMG-mod"], 10) || 0),
+                currDmgEffect = (parseInt(v[dmgEffectCopy], 10) || 0),
+                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",
+            dmgFields = ["repeating_weapon_" + idStr + "total-damage", "repeating_weapon_" + idStr + "enhance",
                "repeating_weapon_" + idStr + "damage-mod"];
-    		updateRowTotal(dmgFields, mod);
-    		if (dmgMod !== currDmgMod) {
-    			setter[dmgModCopy] = dmgMod;
-    			setAny = 1;
-    		}
-    		if (dmgEffect !== currDmgEffect) {
-    			setter[dmgEffectCopy] = dmgEffect;
-    			setAny = 1;
-    		}
-    		if (setAny) { setAttrs(setter, { silent: true }); }
-    	});
+            updateRowTotal(dmgFields, mod);
+            if (dmgMod !== currDmgMod) {
+                setter[dmgModCopy] = dmgMod;
+                setAny = 1;
+            }
+            if (dmgEffect !== currDmgEffect) {
+                setter[dmgEffectCopy] = dmgEffect;
+                setAny = 1;
+            }
+            if (setAny) { setAttrs(setter, { silent: true }); }
+        });
     },
 
-	/*  loops trough all rows and calls updateRepeatingWeaponDamage */
+    /*  loops trough all rows and calls updateRepeatingWeaponDamage */
     updateRepeatingWeaponDamages = function (eventInfo) {
-    	getSectionIDs("repeating_weapon", function (ids) {
-    		ids.forEach(function (id, index) {
-    			updateRepeatingWeaponDamage(id, eventInfo);
-    		});
-    	});
+        getSectionIDs("repeating_weapon", function (ids) {
+            ids.forEach(function (id, index) {
+                updateRepeatingWeaponDamage(id, eventInfo);
+            });
+        });
     },
 
 
-	/******************************************* SKILLS PAGE ********************************/
+    /******************************************* SKILLS PAGE ********************************/
 
     /* updateMaxSkills Calculates maximum skill ranks. Minimum 1 per level.
-	*  divides by 2 if using consolidated skills 
+    *  divides by 2 if using consolidated skills 
     */
-	updateMaxSkills = function (eventInfo) {
-		getAttrs(["total-skill", "total-fcskill", "INT-mod", "level", "Max-Skill-Ranks-mod", "Max-Skill-Ranks", "Max-Skill-Ranks-Misc2",
+    updateMaxSkills = function (eventInfo) {
+        getAttrs(["total-skill", "total-fcskill", "INT-mod", "level", "Max-Skill-Ranks-mod", "Max-Skill-Ranks", "Max-Skill-Ranks-Misc2",
             "unchained_skills-show", "BG-Skill-Use"], function (v) {
-            	var intMod = parseInt(v["INT-mod"], 10) || 0,
-					classSkills = parseInt(v["total-skill"], 10) || 0,
-					otherMod = parseInt(v["Max-Skill-Ranks-Misc2"], 10) || 0,
-					level = parseInt(v.level, 10) || 0,
-					fcSkills = parseInt(v["total-fcskill"], 10) || 0,
-					extra = parseInt(v["Max-Skill-Ranks-mod"], 10) || 0,
-					currSkills = parseInt(v["Max-Skill-Ranks"], 10) || 0,
-					totIntMod, classPlusInt, totAllSkills,
-					setter = {}, setAny = 0;
-            	totIntMod = intMod * level;
-            	classPlusInt = classSkills + totIntMod;
-            	if (v["unchained_skills-show"] == "1" && (!v["BG-Skill-Use"] || v["BG-Skill-Use"] == "0")) {
-            		classPlusInt = Math.floor(classPlusInt / 2);
-            	}
-            	if (classPlusInt < level) { classPlusInt = level; }
-            	totAllSkills = classPlusInt + fcSkills + extra + otherMod;
-            	if (currSkills !== totAllSkills) { setter["Max-Skill-Ranks"] = totAllSkills; setAny++; }
-            	if (setAny) { setAttrs(setter); }
+                var intMod = parseInt(v["INT-mod"], 10) || 0,
+                    classSkills = parseInt(v["total-skill"], 10) || 0,
+                    otherMod = parseInt(v["Max-Skill-Ranks-Misc2"], 10) || 0,
+                    level = parseInt(v.level, 10) || 0,
+                    fcSkills = parseInt(v["total-fcskill"], 10) || 0,
+                    extra = parseInt(v["Max-Skill-Ranks-mod"], 10) || 0,
+                    currSkills = parseInt(v["Max-Skill-Ranks"], 10) || 0,
+                    totIntMod, classPlusInt, totAllSkills,
+                    setter = {}, setAny = 0;
+                totIntMod = intMod * level;
+                classPlusInt = classSkills + totIntMod;
+                if (v["unchained_skills-show"] == "1" && (!v["BG-Skill-Use"] || v["BG-Skill-Use"] == "0")) {
+                    classPlusInt = Math.floor(classPlusInt / 2);
+                }
+                if (classPlusInt < level) { classPlusInt = level; }
+                totAllSkills = classPlusInt + fcSkills + extra + otherMod;
+                if (currSkills !== totAllSkills) { setter["Max-Skill-Ranks"] = totAllSkills; setAny++; }
+                if (setAny) { setAttrs(setter); }
             });
-	},
+    },
 
-	/*verifyHasSkill
-	* Checks to see if you should bother updating the skill after an event.
-	* @skill {string} = the skill name
-	* @callback {function} = a function that takes a a boolean as a first parameter. 
-	*    called with true if you should update, or false if not.
-	*/
-	verifyHasSkill = function (skill, callback) {
-		var first3, first4, core = false, bg = false, cs = false;
-		if (skill && typeof callback === "function") {
-			first4 = skill.substring(0, 4).toLowerCase();
-			first3 = first4.substring(0, 3);
-			if (first3 === 'cs-') {
-				cs = true;
-			} else if (first4 === 'arti' || first4 === 'lore') {
-				bg = true;
-			} else {
-				core = true;
-			}
+    /*verifyHasSkill
+    * Checks to see if you should bother updating the skill after an event.
+    * @skill {string} = the skill name
+    * @callback {function} = a function that takes a a boolean as a first parameter. 
+    *    called with true if you should update, or false if not.
+    */
+    verifyHasSkill = function (skill, callback) {
+        var first3, first4, core = false, bg = false, cs = false;
+        if (skill && typeof callback === "function") {
+            first4 = skill.substring(0, 4).toLowerCase();
+            first3 = first4.substring(0, 3);
+            if (first3 === 'cs-') {
+                cs = true;
+            } else if (first4 === 'arti' || first4 === 'lore') {
+                bg = true;
+            } else {
+                core = true;
+            }
 
-			getAttrs(["BG-Skill-Use", "unchained_skills-show"], function (v) {
-				var retval = true;
-				//TAS.debug("verifyHasSkill",skill,"first4",first4,"cs",cs,"bg",bg,"core",core,"getAttrs",v);
-				if (core && (v["unchained_skills-show"] == "1" && v["BG-Skill-Use"] == "0")) {
-					retval = false;
-				}
-				if (bg && !(v["unchained_skills-show"] == "1" && v["BG-Skill-Use"] == "1")) {
-					retval = false;
-				}
-				if (cs && !(v["unchained_skills-show"] == "1" && v["BG-Skill-Use"] == "0")) {
-					retval = false;
-				}
-				//TAS.debug("verifyHasSkill: returning "+retval);
-				callback(retval);
-			});
-		}
-	},
+            getAttrs(["BG-Skill-Use", "unchained_skills-show"], function (v) {
+                var retval = false;
+                if (core) {
+                    if  (v["unchained_skills-show"] == "0" || v["BG-Skill-Use"] == "1") {
+                        retval = true;
+                    }
+                } else if (bg) {
+                    if (v["unchained_skills-show"] == "1" && v["BG-Skill-Use"] == "1") {
+                        retval = true;
+                    }
+                } else {
+                    if (v["unchained_skills-show"] == "1" && v["BG-Skill-Use"] == "0") {
+                        retval = true;
+                    }
+                }
+                //TAS.debug("verifyHasSkill: returning "+retval);
+                callback(retval);
+            });
+        }
+    },
 
-	/* updates one  skill row 
-	* @skill {string} skill to update, must have same capitalization as on HTML
-	* @ability {string} {optional} = the value of the ability dropdown
-	* @abilityMod {string} {optional} = the value of the ability mod
-	*/
+
+
+    /* updates one  skill row 
+    * @skill {string} skill to update, must have same capitalization as on HTML
+    * @ability {string} {optional} = the value of the ability dropdown
+    * @abilityMod {string} {optional} = the value of the ability mod
+    */
     updateSkill = function (skill) {
-    	var csNm = skill + "-cs",
+        var csNm = skill + "-cs",
         ranksNm = skill + "-ranks",
         classNm = skill + "-class",
         abNm = skill + "-ability",
@@ -15154,562 +15182,558 @@ var PFSheet = PFSheet || (function () {
         itemNm = skill + "-item",
         miscNm = skill + "-misc",
         rtNm = skill + "-ReqTrain";
-		verifyHasSkill(skill, function (hasSkill) {
-			if (hasSkill) {
-    	getAttrs([skill, csNm, ranksNm, classNm, abNm, modNm, racialNm, featNm, itemNm, miscNm, rtNm,
-        "size_skill", "size_skill_double", "acp", "checks-cond", "Phys-skills-cond", "Perception-cond"], function (v) {
+        verifyHasSkill(skill, function (hasSkill) {
+            if (hasSkill) {
+			getAttrs([skill, csNm, ranksNm, classNm, abNm, modNm, racialNm, featNm, itemNm, miscNm, rtNm,
+			"size_skill", "size_skill_double", "acp", "checks-cond", "Phys-skills-cond", "Perception-cond"], function (v) {
 
-        	var skillSize = 0, adj, skillTot = 0, setter = {}, mods = "", setAny = 0, cond = 0,
-            cs = parseInt(v[csNm], 10) || 0,
-            currSkill = parseInt(v[skill], 10),//no default
-            ranks = parseInt(v[ranksNm], 10) || 0,
-            rt = parseInt(v[rtNm], 10) || 0,
-            allCond = parseInt(v["checks-cond"], 10) || 0,
-            abilityName = findAbilityInString(v[abNm]),
-            physCond = 0, perCond = 0;
+				var skillSize = 0, adj, skillTot = 0, setter = {}, mods = "", setAny = 0, cond = 0,
+				cs = parseInt(v[csNm], 10) || 0,
+				currSkill = parseInt(v[skill], 10),//no default
+				ranks = parseInt(v[ranksNm], 10) || 0,
+				rt = parseInt(v[rtNm], 10) || 0,
+				allCond = parseInt(v["checks-cond"], 10) || 0,
+				abilityName = findAbilityInString(v[abNm]),
+				physCond = 0, perCond = 0;
 
-        	if (ranks && cs) {
-        		skillTot += 3;
-        		mods = "3/";
-        	} else {
-        		mods = "0/";
-        	}
-        	if (abilityName === "DEX-mod" || abilityName === "STR-mod") {
-        		adj = parseInt(v["acp"], 10) || 0;
-        		skillTot += adj;
-        		mods += adj + "/";
-        	} else {
-        		mods += "0/";
-        	}
-        	skillSize = sizeSkills[skill];
-        	if (skillSize) {
-        		if (skillSize === 1) {
-        			adj = parseInt(v["size_skill"], 10) || 0;
-        			skillTot += adj;
-        			mods += adj + "/";
-        		} else if (skillSize === 2) {
-        			adj = parseInt(v["size_skill_double"], 10) || 0;
-        			skillTot += adj;
-        			mods += adj + "/";
-        		}
-        	} else {
-        		mods += "0/";
-        	}
-        	if (abilityName === "DEX-mod" || abilityName === "STR-mod") {
-        		physCond = parseInt(v["Phys-skills-cond"], 10) || 0;
-        	}
-        	if (skill === "Perception" || skill === "CS-Perception") {
-        		perCond = parseInt(v["Perception-cond"], 10) || 0;
-        	}
-        	cond = allCond + physCond + perCond;
-        	mods += cond;
+				if (ranks && cs) {
+					skillTot += 3;
+					mods = "3/";
+				} else {
+					mods = "0/";
+				}
+				if (abilityName === "DEX-mod" || abilityName === "STR-mod") {
+					adj = parseInt(v["acp"], 10) || 0;
+					skillTot += adj;
+					mods += adj + "/";
+				} else {
+					mods += "0/";
+				}
+				skillSize = sizeSkills[skill];
+				if (skillSize) {
+					if (skillSize === 1) {
+						adj = parseInt(v["size_skill"], 10) || 0;
+						skillTot += adj;
+						mods += adj + "/";
+					} else if (skillSize === 2) {
+						adj = parseInt(v["size_skill_double"], 10) || 0;
+						skillTot += adj;
+						mods += adj + "/";
+					}
+				} else {
+					mods += "0/";
+				}
+				if (abilityName === "DEX-mod" || abilityName === "STR-mod") {
+					physCond = parseInt(v["Phys-skills-cond"], 10) || 0;
+				}
+				if (skill === "Perception" || skill === "CS-Perception") {
+					perCond = parseInt(v["Perception-cond"], 10) || 0;
+				}
+				cond = allCond + physCond + perCond;
+				mods += cond;
 
-        	skillTot += ranks + cond + (parseInt(v[modNm], 10) || 0) + (parseInt(v[racialNm], 10) || 0) +
-                (parseInt(v[featNm], 10) || 0) + (parseInt(v[itemNm], 10) || 0) + (parseInt(v[miscNm], 10) || 0);
+				skillTot += ranks + cond + (parseInt(v[modNm], 10) || 0) + (parseInt(v[racialNm], 10) || 0) +
+					(parseInt(v[featNm], 10) || 0) + (parseInt(v[itemNm], 10) || 0) + (parseInt(v[miscNm], 10) || 0);
 
-        	if (currSkill !== skillTot) {
-        		setter[skill] = skillTot;
-        		setAny++;
-        	}
+				if (currSkill !== skillTot) {
+					setter[skill] = skillTot;
+					setAny++;
+				}
 
 
-        	if ((v[classNm] || "0/0/0/0") !== mods) {
-        		setter[classNm] = mods;
-        		setAny++;
-        	}
-        	if (setAny) {
-        		//TAS.debug({"function":"updateSkill","currSkill":currSkill,"newSkill":skillTot,"oldmods":v[classNm],"mods":mods				});
-        		setAttrs(setter);
-        	}
+				if ((v[classNm] || "0/0/0/0") !== mods) {
+					setter[classNm] = mods;
+					setAny++;
+				}
+				if (setAny) {
+					//TAS.debug({"function":"updateSkill","currSkill":currSkill,"newSkill":skillTot,"oldmods":v[classNm],"mods":mods                });
+					setAttrs(setter);
+				}
+			});
+            }
         });
-			}
-		});
     },
 
-	/******** ITEMS PAGE ********/
+    /******** ITEMS PAGE ********/
 
-	/* updateWornEquipment
-	 * updates the totals for worn equipment
-	 *
-	* col can be: charges, weight, hp, hp_max, or value (see wornEquipmentColumns)
-	 */
-	updateWornEquipment = function (col) {
-		var attribList = ["worn-total-" + col];
+    /* updateWornEquipment
+     * updates the totals for worn equipment
+     *
+    * col can be: charges, weight, hp, hp_max, or value (see wornEquipmentColumns)
+     */
+    updateWornEquipment = function (col) {
+        var attribList = ["worn-total-" + col];
         wornEquipmentRows.forEach(function (slot) {
-			attribList.push("worn-" + slot + "-" + col);
-		});
-		updateRowTotal(attribList,null,null,true);
-	},
+            attribList.push("worn-" + slot + "-" + col);
+        });
+        updateRowTotal(attribList,null,null,true);
+    },
 
-	updateRepeatingItems = function () {
-   		TAS.repeating('item')
-			.attrs('item_total_weight', 'item-total-hp', 'item-total-hp_max', 'item-total-value')
-			.fields('weight', 'qty', 'qty_max', 'location', 'hp', 'hp_max', 'value')
-			.reduce(function (m, r) {
-				if (r.I.qty > 0 && r.I.location == 0) {
-					if (r.I.qty_max == 0) {
-						m.weight += r.F.weight * r.I.qty;
-					} else {
-						m.weight += r.F.weight;
-					}
-				}
-				m.hp += r.I.hp;
-				m.hp_max += r.I.hp_max;
-				m.value += r.I.value;
-				return m;
-			}, {
-				weight: 0,
-				hp: 0,
-				hp_max: 0,
-				value: 0
-			}, function (m, r, a) {
-				a.S['item_total_weight'] = m.weight;
-				a.S['item-total-hp'] = m.hp;
-				a.S['item-total-hp_max'] = m.hp_max;
-				a.S['item-total-value'] = m.value;
-			})
-			.execute();		
-	},
-	
+    updateRepeatingItems = function () {
+        TAS.repeating('item')
+            .attrs('item_total_weight', 'item-total-hp', 'item-total-hp_max', 'item-total-value')
+            .fields('weight', 'qty', 'qty_max', 'location', 'hp', 'hp_max', 'value')
+            .reduce(function (m, r) {
+                if (r.I.qty > 0 && r.I.location == 0) {
+                    if (r.I.qty_max == 0) {
+                        m.weight += r.F.weight * r.I.qty;
+                    } else {
+                        m.weight += r.F.weight;
+                    }
+                }
+                m.hp += r.I.hp;
+                m.hp_max += r.I.hp_max;
+                m.value += r.I.value;
+                return m;
+            }, {
+                weight: 0,
+                hp: 0,
+                hp_max: 0,
+                value: 0
+            }, function (m, r, a) {
+                a.S['item_total_weight'] = m.weight;
+                a.S['item-total-hp'] = m.hp;
+                a.S['item-total-hp_max'] = m.hp_max;
+                a.S['item-total-value'] = m.value;
+            })
+            .execute();     
+    },
+    
     /* updateCarriedCurrency
      * updates the total for carried currency
      *
      */
-	updateCarriedCurrency = function () {
-		getAttrs(["CP", "SP", "GP", "PP", "carried-currency"], function (v) {
-			var curr = parseInt(v["carried-currency"], 10) || 0,
+    updateCarriedCurrency = function () {
+        getAttrs(["CP", "SP", "GP", "PP", "carried-currency"], function (v) {
+            var curr = parseInt(v["carried-currency"], 10) || 0,
             carried = ((parseInt(v["CP"], 10) || 0) + (parseInt(v["SP"], 10) || 0) + (parseInt(v["GP"], 10) || 0) + (parseInt(v["PP"], 10) || 0)) / 50;
-			//TAS.debug("curr=" + curr + ", carried=" + carried);
-			if (curr !== carried) { setAttrs({ "carried-currency": carried }); }
-		});
-	},
+            //TAS.debug("curr=" + curr + ", carried=" + carried);
+            if (curr !== carried) { setAttrs({ "carried-currency": carried }); }
+        });
+    },
 
     /* updateCarriedTotal
      * updates the total for carried weight
      */
-	updateCarriedTotal = function () {
-		getAttrs(["carried-currency", "item_total_weight", "worn-total-weight", "carried-misc", "carried-total"], function (v) {
-			var curr = parseFloat(v["carried-total"], 10) || 0,
-			carried = ((parseFloat(v["carried-currency"], 10) || 0) * 100 + (parseFloat(v["item_total_weight"], 10) || 0) * 100 + (parseFloat(v["worn-total-weight"], 10) || 0) * 100 + (parseFloat(v["carried-misc"], 10) || 0) * 100) / 100; // Fix bad javascript math
-			//TAS.debug("curr=" + curr + ", carried=" + carried);
-			carried = Math.round(carried);
-			if (curr !== carried) { setAttrs({ "carried-total": carried }); }
-		});
-	},
+    updateCarriedTotal = function () {
+        getAttrs(["carried-currency", "item_total_weight", "worn-total-weight", "carried-misc", "carried-total"], function (v) {
+            var curr = parseFloat(v["carried-total"], 10) || 0,
+            carried = ((parseFloat(v["carried-currency"], 10) || 0) * 100 + (parseFloat(v["item_total_weight"], 10) || 0) * 100 + (parseFloat(v["worn-total-weight"], 10) || 0) * 100 + (parseFloat(v["carried-misc"], 10) || 0) * 100) / 100; // Fix bad javascript math
+            //TAS.debug("curr=" + curr + ", carried=" + carried);
+            //carried = Math.round(carried);
+            if (curr !== carried) { setAttrs({ "carried-total": carried }); }
+        });
+    },
 
     /* updateCurrentLoad
      * updates the current load radio button
      */
-	updateCurrentLoad = function () {
-		getAttrs(["load-light", "load-medium", "current-load", "carried-total"], function (v) {
-			var curr = parseInt(v["current-load"], 10) || 0,
+    updateCurrentLoad = function () {
+        getAttrs(["load-light", "load-medium", "current-load", "carried-total"], function (v) {
+            var curr = parseInt(v["current-load"], 10) || 0,
             carried = parseInt(v["carried-total"], 10) || 0,
             light = parseInt(v["load-light"], 10) || 0,
             medium = parseInt(v["load-medium"], 10) || 0;
-			//TAS.debug("current-load=" + curr + ", carried-total=" + carried + ", load-light=" + light + ", load-medium=" + medium);
-			if (carried <= light) {
-				//TAS.debug("light load");
-				if (curr !== 0) { setAttrs({ "current-load": 0 }); }
-			} else if (carried <= medium) {
-				//TAS.debug("medium load");
-				if (curr !== 1) { setAttrs({ "current-load": 1 }); }
-			} else {
-				//TAS.debug("heavy load");
-				if (curr !== 2) { setAttrs({ "current-load": 2 }); }
-			}
-		});
-	},
+            //TAS.debug("current-load=" + curr + ", carried-total=" + carried + ", load-light=" + light + ", load-medium=" + medium);
+            if (carried <= light) {
+                //TAS.debug("light load");
+                if (curr !== 0) { setAttrs({ "current-load": 0 }); }
+            } else if (carried <= medium) {
+                //TAS.debug("medium load");
+                if (curr !== 1) { setAttrs({ "current-load": 1 }); }
+            } else {
+                //TAS.debug("heavy load");
+                if (curr !== 2) { setAttrs({ "current-load": 2 }); }
+            }
+        });
+    },
 
-	// Returns the carrying capacity for a given strength score and load type
-	// Will recursively calculate for strength scores over 29
+    // Returns the carrying capacity for a given strength score and load type
+    // Will recursively calculate for strength scores over 29
     getCarryingCapacity = function (str, load) {
-    	var l, m, h;
-    	switch (str) {
-    		case 0: l = 0; m = 0; h = 0; break;
-    		case 1: l = 3; m = 6; h = 10; break;
-    		case 2: l = 6; m = 13; h = 20; break;
-    		case 3: l = 10; m = 20; h = 30; break;
-    		case 4: l = 13; m = 26; h = 40; break;
-    		case 5: l = 16; m = 33; h = 50; break;
-    		case 6: l = 20; m = 40; h = 60; break;
-    		case 7: l = 23; m = 46; h = 70; break;
-    		case 8: l = 26; m = 53; h = 80; break;
-    		case 9: l = 30; m = 60; h = 90; break;
-    		case 10: l = 33; m = 66; h = 100; break;
-    		case 11: l = 38; m = 76; h = 115; break;
-    		case 12: l = 43; m = 86; h = 130; break;
-    		case 13: l = 50; m = 100; h = 150; break;
-    		case 14: l = 58; m = 116; h = 175; break;
-    		case 15: l = 66; m = 133; h = 200; break;
-    		case 16: l = 76; m = 153; h = 230; break;
-    		case 17: l = 86; m = 173; h = 260; break;
-    		case 18: l = 100; m = 200; h = 300; break;
-    		case 19: l = 116; m = 233; h = 350; break;
-    		case 20: l = 133; m = 266; h = 400; break;
-    		case 21: l = 153; m = 306; h = 460; break;
-    		case 22: l = 173; m = 346; h = 520; break;
-    		case 23: l = 200; m = 400; h = 600; break;
-    		case 24: l = 233; m = 466; h = 700; break;
-    		case 25: l = 266; m = 533; h = 800; break;
-    		case 26: l = 306; m = 613; h = 920; break;
-    		case 27: l = 346; m = 693; h = 1040; break;
-    		case 28: l = 400; m = 800; h = 1200; break;
-    		case 29: l = 466; m = 933; h = 1400; break;
-    		default: l = getCarryingCapacity(str - 10, "light") * 4; m = getCarryingCapacity(str - 10, "medium") * 4; h = getCarryingCapacity(str - 10, "heavy") * 4; break;
-    	}
-    	if (load == "light") { return l; }
-    	else if (load == "medium") { return m; }
-    	else if (load == "heavy") { return h; }
+        var l, m, h;
+        switch (str) {
+            case 0: l = 0; m = 0; h = 0; break;
+            case 1: l = 3; m = 6; h = 10; break;
+            case 2: l = 6; m = 13; h = 20; break;
+            case 3: l = 10; m = 20; h = 30; break;
+            case 4: l = 13; m = 26; h = 40; break;
+            case 5: l = 16; m = 33; h = 50; break;
+            case 6: l = 20; m = 40; h = 60; break;
+            case 7: l = 23; m = 46; h = 70; break;
+            case 8: l = 26; m = 53; h = 80; break;
+            case 9: l = 30; m = 60; h = 90; break;
+            case 10: l = 33; m = 66; h = 100; break;
+            case 11: l = 38; m = 76; h = 115; break;
+            case 12: l = 43; m = 86; h = 130; break;
+            case 13: l = 50; m = 100; h = 150; break;
+            case 14: l = 58; m = 116; h = 175; break;
+            case 15: l = 66; m = 133; h = 200; break;
+            case 16: l = 76; m = 153; h = 230; break;
+            case 17: l = 86; m = 173; h = 260; break;
+            case 18: l = 100; m = 200; h = 300; break;
+            case 19: l = 116; m = 233; h = 350; break;
+            case 20: l = 133; m = 266; h = 400; break;
+            case 21: l = 153; m = 306; h = 460; break;
+            case 22: l = 173; m = 346; h = 520; break;
+            case 23: l = 200; m = 400; h = 600; break;
+            case 24: l = 233; m = 466; h = 700; break;
+            case 25: l = 266; m = 533; h = 800; break;
+            case 26: l = 306; m = 613; h = 920; break;
+            case 27: l = 346; m = 693; h = 1040; break;
+            case 28: l = 400; m = 800; h = 1200; break;
+            case 29: l = 466; m = 933; h = 1400; break;
+            default: l = getCarryingCapacity(str - 10, "light") * 4; m = getCarryingCapacity(str - 10, "medium") * 4; h = getCarryingCapacity(str - 10, "heavy") * 4; break;
+        }
+        if (load == "light") { return l; }
+        else if (load == "medium") { return m; }
+        else if (load == "heavy") { return h; }
     },
 
     /* updateLoadsAndLift
     * updates the load and lift numbers
     */
     updateLoadsAndLift = function () {
-		getAttrs(["STR", "size", "legs", "load-light", "load-medium", "load-heavy", "lift-above-head", "lift-off-ground", "lift-drag-and-push",
-			"load-str-bonus", "load-multiplier", "load-misc"], function (v) {
-    		var str = parseInt(v["STR"], 10) || 0,
+        getAttrs(["STR", "size", "legs", "load-light", "load-medium", "load-heavy", "lift-above-head", "lift-off-ground", "lift-drag-and-push",
+            "load-str-bonus", "load-multiplier", "load-misc"], function (v) {
+            var str = parseInt(v["STR"], 10) || 0,
             size = parseInt(v["size"], 10) || 0,
             legs = parseInt(v["legs"], 10) || 0,
             light = parseInt(v["load-light"], 10) || 0,
             medium = parseInt(v["load-medium"], 10) || 0,
             heavy = parseInt(v["load-heavy"], 10) || 0,
-			aboveHead = parseInt(v["lift-above-head"], 10) || 0,
-			offGround = parseInt(v["lift-off-ground"], 10) || 0,
+            aboveHead = parseInt(v["lift-above-head"], 10) || 0,
+            offGround = parseInt(v["lift-off-ground"], 10) || 0,
             drag = parseInt(v["lift-drag-and-push"], 10) || 0,
-			strMod = parseInt(v["load-str-bonus"], 10) || 0,
-			loadMult = parseInt(v["load-multiplier"], 10) || 0,
+            strMod = parseInt(v["load-str-bonus"], 10) || 0,
+            loadMult = parseInt(v["load-multiplier"], 10) || 0,
             misc = parseInt(v["load-misc"], 10) || 0;
-			//TAS.debug("STR=" + str + ", legs=" + legs + ", load-light=" + light + ", load-medium=" + medium + ", load-heavy=" + heavy + ", lift-above-head=" + aboveHead + ", lift-off-ground=" + offGround + ", lift-drag-and-push=" + drag + ", load-str-bonus=" + strMod + ", load-multiplier=" + loadMult + ", load-misc=" + misc);
-			if (loadMult < 1) { loadMult = 1; }
-			loadMult--;
+            //TAS.debug("STR=" + str + ", legs=" + legs + ", load-light=" + light + ", load-medium=" + medium + ", load-heavy=" + heavy + ", lift-above-head=" + aboveHead + ", lift-off-ground=" + offGround + ", lift-drag-and-push=" + drag + ", load-str-bonus=" + strMod + ", load-multiplier=" + loadMult + ", load-misc=" + misc);
+            if (loadMult < 1) { loadMult = 1; }
+            loadMult--;
 
-			var l = getCarryingCapacity(str + strMod, "light") + misc,
-			m = getCarryingCapacity(str + strMod, "medium") + misc,
-			h = getCarryingCapacity(str + strMod, "heavy") + misc,
+            var l = getCarryingCapacity(str + strMod, "light") + misc,
+            m = getCarryingCapacity(str + strMod, "medium") + misc,
+            h = getCarryingCapacity(str + strMod, "heavy") + misc,
             mult = 1;
-    		if (legs == 2) {
-    			switch (size) {
-    				case -8: mult = 16; break;
-    				case -4: mult = 8; break;
-    				case -2: mult = 4; break;
-    				case -1: mult = 2; break;
-    				case 1: mult = 3 / 4; break;
-    				case 2: mult = 1 / 2; break;
-    				case 4: mult = 1 / 4; break;
-    				case 8: mult = 1 / 8; break;
-    			}
-    		} else if (legs == 4) {
-    			switch (size) {
-    				case -8: mult = 24; break;
-    				case -4: mult = 12; break;
-    				case -2: mult = 6; break;
-    				case -1: mult = 3; break;
-    				case 0: mult = 1.5; break;
-    				case 1: mult = 1; break;
-    				case 2: mult = 3 / 4; break;
-    				case 4: mult = 1 / 2; break;
-    				case 8: mult = 1 / 4; break;
-    			}
-    		}
-			mult += loadMult;
-    		l *= mult; m *= mult; h *= mult;
-			var a = h, o = h * 2, d = h * 5, setter = {}, setAny = 0;
+            if (legs == 2) {
+                switch (size) {
+                    case -8: mult = 16; break;
+                    case -4: mult = 8; break;
+                    case -2: mult = 4; break;
+                    case -1: mult = 2; break;
+                    case 1: mult = 3 / 4; break;
+                    case 2: mult = 1 / 2; break;
+                    case 4: mult = 1 / 4; break;
+                    case 8: mult = 1 / 8; break;
+                }
+            } else if (legs == 4) {
+                switch (size) {
+                    case -8: mult = 24; break;
+                    case -4: mult = 12; break;
+                    case -2: mult = 6; break;
+                    case -1: mult = 3; break;
+                    case 0: mult = 1.5; break;
+                    case 1: mult = 1; break;
+                    case 2: mult = 3 / 4; break;
+                    case 4: mult = 1 / 2; break;
+                    case 8: mult = 1 / 4; break;
+                }
+            }
+            mult += loadMult;
+            l *= mult; m *= mult; h *= mult;
+            var a = h, o = h * 2, d = h * 5, setter = {}, setAny = 0;
 
-    		//TAS.debug("new light load=" + l + ", new medium load=" + m + ", new heavy load=" + h + ", new above head=" + a + ", new off ground=" + o + ", new drag=" + d);
+            //TAS.debug("new light load=" + l + ", new medium load=" + m + ", new heavy load=" + h + ", new above head=" + a + ", new off ground=" + o + ", new drag=" + d);
             if (light !== l) { setter["load-light"] = l; setAny = 1; }
             if (medium !== m) { setter["load-medium"] = m; setAny = 1; }
             if (heavy !== h) { setter["load-heavy"] = h; setAny = 1; }
             if (aboveHead !== a) { setter["lift-above-head"] = a; setAny = 1; }
             if (offGround !== o) { setter["lift-off-ground"] = o; setAny = 1; }
             if (drag !== d) { setter["lift-drag-and-push"] = d; setAny = 1; }
-			if (setAny) { setAttrs(setter); }
-    	});
+            if (setAny) { setAttrs(setter); }
+        });
     },
 
-	/*******************************************  SPELL PAGE ***********************/
+    /*******************************************  SPELL PAGE ***********************/
 
-	/********  Spell Classes top section ****/
-	/*  findSpellClass - determines spell class from class dropdown in the spell repeating row
-	*/
-	findSpellClass = function (selected, class0name, class1name, class2name) {
-		if (!selected) { return 0; } //it is undefined if it is default set to the first one
-		if (selected.indexOf("0") >= 0) { return 0; }
-		if (selected.indexOf("1") >= 0) { return 1; }
-		if (selected.indexOf("2") >= 0) { return 2; }
-		if (selected === class0name) { return 0; }
-		if (selected === class1name) { return 1; }
-		if (selected === class2name) { return 2; }
-		return 0;
-	},
+    /********  Spell Classes top section ****/
+    /*  findSpellClass - determines spell class from class dropdown in the spell repeating row
+    */
+    findSpellClass = function (selected, class0name, class1name, class2name) {
+        if (!selected) { return 0; } //it is undefined if it is default set to the first one
+        if (selected.indexOf("0") >= 0) { return 0; }
+        if (selected.indexOf("1") >= 0) { return 1; }
+        if (selected.indexOf("2") >= 0) { return 2; }
+        if (selected === class0name) { return 0; }
+        if (selected === class1name) { return 1; }
+        if (selected === class2name) { return 2; }
+        return 0;
+    },
 
 
-	calculateSpellRanges = function (casterlevel) {
-		casterlevel = casterlevel || 0;
-		return {
-			close: 25 + (5 * (Math.floor(casterlevel / 2)))
-			, medium: 100 + (10 * casterlevel)
-			, "long": 400 + (40 * casterlevel)
-		};
-	},
+    calculateSpellRanges = function (casterlevel) {
+        casterlevel = casterlevel || 0;
+        return {
+            close: 25 + (5 * (Math.floor(casterlevel / 2)))
+            , medium: 100 + (10 * casterlevel)
+            , "long": 400 + (40 * casterlevel)
+        };
+    },
 
-	findSpellRange = function (range, ranges, area, casterlevel) {
-		var newRange = 0, tempRange = 0, tempMatches, tempMatches2, flatnumber = false;
+    findSpellRange = function (range, ranges, area, casterlevel) {
+        var newRange = 0, tempRange = 0, tempMatches, tempMatches2, flatnumber = false;
 
-		if (!range) {
-			//if range is blank, use the number in area/effect/targets since it will be "30ft emanation" or something similar
-			if (!area) {
-				return 0;
-			} else {
-				return findSpellRange(area, ranges, null, casterlevel);
-			}
-		}
+        if (!range) {
+            //if range is blank, use the number in area/effect/targets since it will be "30ft emanation" or something similar
+            if (!area) {
+                return 0;
+            } else {
+                return findSpellRange(area, ranges, null, casterlevel);
+            }
+        }
 
-		//if "or" or "and" are found, skip past and redo since second value is always greater
-		tempMatches = range.match(/\sor|and\s/i);
-		if (tempMatches && tempMatches[0]) {
-			return findSpellRange(range.substring(tempMatches.index + tempMatches[0].length), ranges, area, casterlevel);
-		}
-		tempRange = parseInt(range, 10);
-		if (tempRange >= 0) {
-			if (/\/level/i.test(range)) {
-				newRange = tempRange * casterlevel;
-			} else {
-				newRange = tempRange;
-			}
-			flatnumber = true;
-		} else {
-			range = range.toLowerCase(); //for easier switch statement
-			tempMatches = range.match(/personal|you|touch|special|see text|close|short|medium|long|unlimited|reach|\/level/);
-			if (tempMatches && tempMatches[0]) {
-				switch (tempMatches[0]) {
-					case 'close':
-					case 'short':
-						newRange = ranges.close;
-						break;
-					case 'medium':
-						newRange = ranges.medium;
-						break;
-					case 'long':
-						newRange = ranges["long"];
-						break;
-					case 'personal':
-					case 'you':
-					case 'touch':
-					case 'special':
-					case 'see text':
-						newRange = 0;
-						break;
-					case '/level':
-						tempMatches2 = range.match(/(\d+)\D*\/level/);
-						if (tempMatches2 && tempMatches2[1]) {
-							tempRange = parseInt(tempMatches2[1], 10) || 0;
-							newRange = tempRange * casterlevel;
-							flatnumber = true;
-						} else {
-							newRange = 0;
-						}
-						break;
-					case 'unlimited':
-						newRange = 999;
-						break;
-					case 'reach':
-						newRange = 5;
-						break;
-					default:
-						newRange = 0;
-				}
-			}
+        //if "or" or "and" are found, skip past and redo since second value is always greater
+        tempMatches = range.match(/\sor|and\s/i);
+        if (tempMatches && tempMatches[0]) {
+            return findSpellRange(range.substring(tempMatches.index + tempMatches[0].length), ranges, area, casterlevel);
+        }
+        tempRange = parseInt(range, 10);
+        if (tempRange >= 0) {
+            if (/\/level/i.test(range)) {
+                newRange = tempRange * casterlevel;
+            } else {
+                newRange = tempRange;
+            }
+            flatnumber = true;
+        } else {
+            range = range.toLowerCase(); //for easier switch statement
+            tempMatches = range.match(/personal|you|touch|special|see text|close|short|medium|long|unlimited|reach|\/level/);
+            if (tempMatches && tempMatches[0]) {
+                switch (tempMatches[0]) {
+                    case 'close':
+                    case 'short':
+                        newRange = ranges.close;
+                        break;
+                    case 'medium':
+                        newRange = ranges.medium;
+                        break;
+                    case 'long':
+                        newRange = ranges["long"];
+                        break;
+                    case 'personal':
+                    case 'you':
+                    case 'touch':
+                    case 'special':
+                    case 'see text':
+                        newRange = 0;
+                        break;
+                    case '/level':
+                        tempMatches2 = range.match(/(\d+)\D*\/level/);
+                        if (tempMatches2 && tempMatches2[1]) {
+                            tempRange = parseInt(tempMatches2[1], 10) || 0;
+                            newRange = tempRange * casterlevel;
+                            flatnumber = true;
+                        } else {
+                            newRange = 0;
+                        }
+                        break;
+                    case 'unlimited':
+                        newRange = 999;
+                        break;
+                    case 'reach':
+                        newRange = 5;
+                        break;
+                    default:
+                        newRange = 0;
+                }
+            }
 
-		}
-		if (flatnumber) {
-			if (/mile/i.test(range)) {
-				newRange = newRange * 5280;//really should we bother?
-			} else if (/square/i.test(range)) {
-				newRange = newRange * 5;
-			}
-		}
+        }
+        if (flatnumber) {
+            if (/mile/i.test(range)) {
+                newRange = newRange * 5280;//really should we bother?
+            } else if (/square/i.test(range)) {
+                newRange = newRange * 5;
+            }
+        }
 
-		return newRange;
-	},
+        return newRange;
+    },
 
-	/* ifSpellClassExists - is a spell level filled in or not.
-	* if spellclass-classidx-level is greater than 0 then call the callback 
-	* only check level, not level-total, since modifiers could cause it to drop
-	*/
-	ifSpellClassExists = function (classidx, callback) {
-		//TAS.debug("ifSpellClassExists",classidx,typeof callback);
-		getAttrs(["spellclass-" + classidx + "-level"], function (v) {
-			if ((parseInt(v["spellclass-" + classidx + "-level"], 10) || 0) > 0) {
-				if (typeof callback === "function") {
-					callback();
-				} else {
-					TAS.error("ifSpellClassExists", "callback is not a function!: " + typeof callback);
-				}
-			}
-		});
-	},
+    /* ifSpellClassExists - is a spell level filled in or not.
+    * if spellclass-classidx-level is greater than 0 then call the callback 
+    * only check level, not level-total, since modifiers could cause it to drop
+    */
+    ifSpellClassExists = function (classidx, callback) {
+        //TAS.debug("ifSpellClassExists",classidx,typeof callback);
+        getAttrs(["spellclass-" + classidx + "-level"], function (v) {
+            if ((parseInt(v["spellclass-" + classidx + "-level"], 10) || 0) > 0) {
+                if (typeof callback === "function") {
+                    callback();
+                } else {
+                    TAS.error("ifSpellClassExists", "callback is not a function!: " + typeof callback);
+                }
+            }
+        });
+    },
 
-	/* updateSpellClassLevel - when the class level is updated on the CLASS page, sync the level on the SPELL page
-	* but not vice versa
-	* @classidx {number} = the row on the CLASS GRID starting with 0
-	*/
-	updateSpellClassLevel = function (classidx, eventInfo, force) {
-		var spellclassdropdown0 = "spellclass-0", spellclassdropdown1 = "spellclass-1", spellclassdropdown2 = "spellclass-2";
-		getAttrs([spellclassdropdown0, spellclassdropdown1, spellclassdropdown2], function (va) {
-			var spellclassidx, spellclasslevel, classlevel, prefix;
-			if (parseInt(va[spellclassdropdown0], 10) === classidx) { spellclassidx = 0; }
-			else if (parseInt(va[spellclassdropdown1], 10) === classidx) { spellclassidx = 1; }
-			else if (parseInt(va[spellclassdropdown2], 10) === classidx) { spellclassidx = 2; }
-			else { return; }
-			prefix = "spellclass-" + spellclassidx;
-			spellclasslevel = prefix + "-level";
-			classlevel = "class-" + classidx + "-level";
-			getAttrs([spellclasslevel, classlevel], function (v) {
-				var setter = {}, cll = parseInt(v[classlevel], 10) || 0
-				, spl = parseInt(v[spellclasslevel], 10)
-				;
-				if (cll !== spl || isNaN(spl) || force) {
-					setter[spellclasslevel] = cll;
-					setAttrs(setter);
-				}
-			});
-		});
-	},
+    /* updateSpellClassLevel - when the class level is updated on the CLASS page, sync the level on the SPELL page
+    * but not vice versa
+    * @classidx {number} = the row on the CLASS GRID starting with 0
+    */
+    updateSpellClassLevel = function (classidx, eventInfo, force) {
+        var spellclassdropdown0 = "spellclass-0", spellclassdropdown1 = "spellclass-1", spellclassdropdown2 = "spellclass-2";
+        getAttrs([spellclassdropdown0, spellclassdropdown1, spellclassdropdown2], function (va) {
+            var spellclassidx, spellclasslevel, classlevel, prefix;
+            if (parseInt(va[spellclassdropdown0], 10) === classidx) { spellclassidx = 0; }
+            else if (parseInt(va[spellclassdropdown1], 10) === classidx) { spellclassidx = 1; }
+            else if (parseInt(va[spellclassdropdown2], 10) === classidx) { spellclassidx = 2; }
+            else { return; }
+            prefix = "spellclass-" + spellclassidx;
+            spellclasslevel = prefix + "-level";
+            classlevel = "class-" + classidx + "-level";
+            getAttrs([spellclasslevel, classlevel], function (v) {
+                var setter = {}, cll = parseInt(v[classlevel], 10) || 0
+                , spl = parseInt(v[spellclasslevel], 10)
+                ;
+                if (cll !== spl || isNaN(spl) || force) {
+                    setter[spellclasslevel] = cll;
+                    setAttrs(setter);
+                }
+            });
+        });
+    },
 
-	/*updateSpellClassRange
-	* updates the ranges at the top for this spellcasting class
-	*/
-	updateSpellClassRange = function (spellclassidx, eventInfo, force) {
-		//TAS.debug("at updateSpellClassRange, spellclass:" + spellclassidx);
-		var prefix = "spellclass-" + spellclassidx
-		  , lvlField = prefix + "-level-total"
-		  , closeField = prefix + "-close"
-		  , medField = prefix + "-medium"
-		  , longField = prefix + "-long";
-		getAttrs([lvlField, closeField, medField, longField], function (v) {
-			//TAS.debug(v);
-			var level = (parseInt(v[lvlField], 10) || 0)
-			, ranges = calculateSpellRanges(level)
-			, closeRng = parseInt(v[closeField], 10) || 0
-			, medRng = parseInt(v[medField], 10) || 0
-			, longRng = parseInt(v[longField], 10) || 0
-			, setter = {};
-			//TAS.debug(level,closeRng,medRng,longRng,ranges);
-			if (force || ranges.close !== closeRng || ranges.medium !== medRng || ranges["long"] !== longRng) {
-				setter[closeField] = ranges.close;
-				setter[medField] = ranges.medium;
-				setter[longField] = ranges["long"];
-				setAttrs(setter);
-			}
-		});
-	},
+    /*updateSpellClassRange
+    * updates the ranges at the top for this spellcasting class
+    */
+    updateSpellClassRange = function (spellclassidx, eventInfo, force) {
+        //TAS.debug("at updateSpellClassRange, spellclass:" + spellclassidx);
+        var prefix = "spellclass-" + spellclassidx
+          , lvlField = prefix + "-level-total"
+          , closeField = prefix + "-close"
+          , medField = prefix + "-medium"
+          , longField = prefix + "-long";
+        getAttrs([lvlField, closeField, medField, longField], function (v) {
+            //TAS.debug(v);
+            var level = (parseInt(v[lvlField], 10) || 0)
+            , ranges = calculateSpellRanges(level)
+            , closeRng = parseInt(v[closeField], 10) || 0
+            , medRng = parseInt(v[medField], 10) || 0
+            , longRng = parseInt(v[longField], 10) || 0
+            , setter = {};
+            //TAS.debug(level,closeRng,medRng,longRng,ranges);
+            if (force || ranges.close !== closeRng || ranges.medium !== medRng || ranges["long"] !== longRng) {
+                setter[closeField] = ranges.close;
+                setter[medField] = ranges.medium;
+                setter[longField] = ranges["long"];
+                setAttrs(setter);
+            }
+        });
+    },
 
-	/* handleSpellClassDropdown - sets spell class name and level from dropdown
-	* When the spell class dropdown is changed to one of the 5 classes, update the spellclass name and level.
-	*/
+    /* handleSpellClassDropdown - sets spell class name and level from dropdown
+    * When the spell class dropdown is changed to one of the 5 classes, update the spellclass name and level.
+    */
     handleSpellClassDropdown = function (spellclassidx) {
-    	//TAS.debug("SSSSSSSSSSSSSSSSSSSSS handleSpellClassDropdown, level is :"+spellclassidx);
-    	var spellclassdropdown = "spellclass-" + spellclassidx;
-    	var spellclasslevel = "spellclass-" + spellclassidx + "-level";
-    	getAttrs([spellclassdropdown, spellclasslevel], function (va) {
-    		//TAS.debug(va);
-    		var classidx = (parseInt(va[spellclassdropdown], 10))
-				, sl = parseInt(va[spellclasslevel], 10)
-				, spellclassname, classname, classlevel;
-    		if (isNaN(classidx) || !va[spellclassdropdown] || va[spellclassdropdown] == "-1") {
-    			return;
-    		}
-    		spellclassname = "spellclass-" + spellclassidx + "-name";
-    		classname = "class-" + classidx + "-name";
-    		classlevel = "class-" + classidx + "-level";
-    		//TAS.debug("classname:"+classname+", level:"+ classlevel+", spellname:"+spellclassname);
-    		getAttrs([classname, classlevel, spellclassname], function (v) {
-    			var setter = {}, setAny = 0, cl = parseInt(v[classlevel], 10) || 0;
-    			//TAS.debug("made it into get attrs");
-    			//TAS.debug(v);
-    			if (v[classname] && v[classname] !== v[spellclassname]) {
-    				setter[spellclassname] = v[classname];
-    				setAny = 1;
-    			}
-    			if (sl !== cl || isNaN(sl)) {
-    				setter[spellclasslevel] = cl;
-    				setAny = 1;
-    			}
-    			//TAS.debug("SETTING");
-    			//TAS.debug(setter);
-    			if (setAny) { setAttrs(setter); }
-    			//if (setAny) { setAttrs(setter,{silent:true},updateCasterLevel(spellclassidx,null,cl););}
-    			//if (setAny) { 
-    			//	setAttrs(setter,{silent:true});
-    			//	updateCasterLevel(spellclassidx,null,cl);
-    			//}
-    		});
+        //TAS.debug("SSSSSSSSSSSSSSSSSSSSS handleSpellClassDropdown, level is :"+spellclassidx);
+        var spellclassdropdown = "spellclass-" + spellclassidx;
+        var spellclasslevel = "spellclass-" + spellclassidx + "-level";
+        getAttrs([spellclassdropdown, spellclasslevel], function (va) {
+            //TAS.debug(va);
+            var classidx = (parseInt(va[spellclassdropdown], 10))
+                , sl = parseInt(va[spellclasslevel], 10)
+                , spellclassname, classname, classlevel;
+            if (isNaN(classidx) || !va[spellclassdropdown] || va[spellclassdropdown] == "-1") {
+                return;
+            }
+            spellclassname = "spellclass-" + spellclassidx + "-name";
+            classname = "class-" + classidx + "-name";
+            classlevel = "class-" + classidx + "-level";
+            //TAS.debug("classname:"+classname+", level:"+ classlevel+", spellname:"+spellclassname);
+            getAttrs([classname, classlevel, spellclassname], function (v) {
+                var setter = {}, setAny = 0, cl = parseInt(v[classlevel], 10) || 0;
+                //TAS.debug("made it into get attrs");
+                //TAS.debug(v);
+                if (v[classname] && v[classname] !== v[spellclassname]) {
+                    setter[spellclassname] = v[classname];
+                    setAny = 1;
+                }
+                if (sl !== cl || isNaN(sl)) {
+                    setter[spellclasslevel] = cl;
+                    setAny = 1;
+                }
+                //TAS.debug("SETTING");
+                //TAS.debug(setter);
+                if (setAny) { setAttrs(setter); }
 
-    	});
+            });
+
+        });
     },
 
     /*updateCasterLevel
     */
     updateCasterLevel = function (classidx, eventInfo, classlevel) {
-    	if (!(isNaN(parseInt(classlevel, 10)))) {
-    		updateRowTotal(["spellclass-" + classidx + "-level-total", "spellclass-" + classidx + "-level-misc", "buff_CasterLevel-total", "CasterLevel-Penalty"], classlevel);
-    	} else {
-    		updateRowTotal(["spellclass-" + classidx + "-level-total", "spellclass-" + classidx + "-level", "spellclass-" + classidx + "-level-misc", "buff_CasterLevel-total", "CasterLevel-Penalty"]);
-    	}
+        if (!(isNaN(parseInt(classlevel, 10)))) {
+            updateRowTotal(["spellclass-" + classidx + "-level-total", "spellclass-" + classidx + "-level-misc", "buff_CasterLevel-total", "CasterLevel-Penalty"], classlevel);
+        } else {
+            updateRowTotal(["spellclass-" + classidx + "-level-total", "spellclass-" + classidx + "-level", "spellclass-" + classidx + "-level-misc", "buff_CasterLevel-total", "CasterLevel-Penalty"]);
+        }
     },
 
-	/*  updateCastingPenaltyNote - for condition deafened update penalty note on DEFENSE PAGE 
-	*/
+    /*  updateCastingPenaltyNote - for condition deafened update penalty note on DEFENSE PAGE 
+    */
     updateCastingPenaltyNote = function () {
-    	ifSpellClassExists(0, function () {
-    		getAttrs(["condition-Deafened", "SpellFailureNote"], function (v) {
-    			var setter = {}, notestr = "";
-    			if (v["condition-Deafened"] != "0") {
-    				notestr = "20% spell failure when casting spells with Verbal components";
-    			}
-    			setAttrs({ "SpellFailureNote": notestr });
-    		});
-    	});
+        ifSpellClassExists(0, function () {
+            getAttrs(["condition-Deafened", "SpellFailureNote"], function (v) {
+                var setter = {}, notestr = "";
+                if (v["condition-Deafened"] != "0") {
+                    notestr = "20% spell failure when casting spells with Verbal components";
+                }
+                setAttrs({ "SpellFailureNote": notestr });
+            });
+        });
     },
 
-	/* handleConcentrationAbilityDropdown - updates spell related ability modifier for spell class
-	* @classidx {number} = 0,1,2 the spellclass
-	*/
+    /* handleConcentrationAbilityDropdown - updates spell related ability modifier for spell class
+    * @classidx {number} = 0,1,2 the spellclass
+    */
     handleConcentrationAbilityDropdown = function (classidx) {
-    	handleDropdown("Concentration-" + classidx + "-ability", "Concentration-" + classidx + "-mod");
+        handleDropdown("Concentration-" + classidx + "-ability", "Concentration-" + classidx + "-mod");
     },
 
 
-	/* updateConcentration - updates concentration for spellclass
-	* @classidx {number} = 0,1,2 the spellclass
-	*/
+    /* updateConcentration - updates concentration for spellclass
+    * @classidx {number} = 0,1,2 the spellclass
+    */
     updateConcentration = function (classidx) {
-    	updateRowTotal(["Concentration-" + classidx, "spellclass-" + classidx + "-level-total", "Concentration-" + classidx + "-mod", "Concentration-" + classidx + "-misc"]);
+        updateRowTotal(["Concentration-" + classidx, "spellclass-" + classidx + "-level-total", "Concentration-" + classidx + "-mod", "Concentration-" + classidx + "-misc"]);
     },
 
-	/*updateSpellPenetration
-	*/
-	updateSpellPenetration = function (classidx) {
-		updateRowTotal(["spellclass-" + classidx + "-SP-mod", "spellclass-" + classidx + "-SP_misc", "spellclass-" + classidx + "-level-total"]);
-	},
+    /*updateSpellPenetration
+    */
+    updateSpellPenetration = function (classidx) {
+        updateRowTotal(["spellclass-" + classidx + "-SP-mod", "spellclass-" + classidx + "-SP_misc", "spellclass-" + classidx + "-level-total"]);
+    },
 
 
-	/*** SPELLS PER DAY section ******/
+    /*** SPELLS PER DAY section ******/
 
-	/* updateSaveDCs - update save DCs on left  column of Spells Per Day grid
-	* @classidx {number} = 0,1,2 the spellclass
-	*/
+    /* updateSaveDCs - update save DCs on left  column of Spells Per Day grid
+    * @classidx {number} = 0,1,2 the spellclass
+    */
     updateSaveDCs = function (classidx) {
-    	//TAS.debug("DDDDDDCCCCCC at updateSaveDCs");
-    	getAttrs(["spellclass-" + classidx + "-level"], function (va) {
-    		var fields, classlevel;
-    		classlevel = parseInt(va["spellclass-" + classidx + "-level"], 10);
-    		//TAS.debug("the spellclass level is " + classlevel);
-    		if (isNaN(classlevel) || classlevel < 1) {
-    			return;
-    		}
-    		fields = ["Concentration-" + classidx + "-mod",
+        //TAS.debug("DDDDDDCCCCCC at updateSaveDCs");
+        getAttrs(["spellclass-" + classidx + "-level"], function (va) {
+            var fields, classlevel;
+            classlevel = parseInt(va["spellclass-" + classidx + "-level"], 10);
+            //TAS.debug("the spellclass level is " + classlevel);
+            if (isNaN(classlevel) || classlevel < 1) {
+                return;
+            }
+            fields = ["Concentration-" + classidx + "-mod",
                 "spellclass-" + classidx + "-level-0-savedc",
                 "spellclass-" + classidx + "-level-1-savedc",
                 "spellclass-" + classidx + "-level-2-savedc",
@@ -15720,1056 +15744,1056 @@ var PFSheet = PFSheet || (function () {
                 "spellclass-" + classidx + "-level-7-savedc",
                 "spellclass-" + classidx + "-level-8-savedc",
                 "spellclass-" + classidx + "-level-9-savedc"];
-    		//TAS.debug(fields);
+            //TAS.debug(fields);
 
-    		getAttrs(fields, function (v) {
-    			//TAS.debug(v);
-    			var mod, fieldname, dcBeforeLvl, currDC = 0, newDC = 0, setter = {}, setAny = 0, i;
-    			mod = parseInt(v["Concentration-" + classidx + "-mod"], 10) || 0;
-    			dcBeforeLvl = 10 + mod;
+            getAttrs(fields, function (v) {
+                //TAS.debug(v);
+                var mod, fieldname, dcBeforeLvl, currDC = 0, newDC = 0, setter = {}, setAny = 0, i;
+                mod = parseInt(v["Concentration-" + classidx + "-mod"], 10) || 0;
+                dcBeforeLvl = 10 + mod;
 
-    			fieldname = "spellclass-" + classidx + "-level-0-savedc";
-    			//TAS.debug("the base save dc is: " + dcBeforeLvl + " see if it matches " + fieldname);
-    			currDC = parseInt(v[fieldname], 10);
-    			//TAS.debug("the old base dc is : " + currDC);
-    			//if 0 is different then rest are different. if 0 is same, rest are same.
-    			if (isNaN(currDC) || currDC !== dcBeforeLvl) {
-    				setter[fieldname] = dcBeforeLvl;
-    				for (i = 1; i < 10; i++) {
-    					//TAS.debug("we are at " + i);
-    					fieldname = "spellclass-" + classidx + "-level-" + i + "-savedc";
-    					currDC = parseInt(v[fieldname], 10);
-    					newDC = dcBeforeLvl + i;
-    					//TAS.debug(" field " + fieldname + " is " + currDC + " but new is " + newDC);
-    					if (isNaN(currDC) || currDC !== newDC) {
-    						setter[fieldname] = newDC;
-    					}
-    					//TAS.debug("at " + i + ", the field to find is " + fieldname);
-    				}
-    				setAttrs(setter);
-    			}
-    		});
+                fieldname = "spellclass-" + classidx + "-level-0-savedc";
+                //TAS.debug("the base save dc is: " + dcBeforeLvl + " see if it matches " + fieldname);
+                currDC = parseInt(v[fieldname], 10);
+                //TAS.debug("the old base dc is : " + currDC);
+                //if 0 is different then rest are different. if 0 is same, rest are same.
+                if (isNaN(currDC) || currDC !== dcBeforeLvl) {
+                    setter[fieldname] = dcBeforeLvl;
+                    for (i = 1; i < 10; i++) {
+                        //TAS.debug("we are at " + i);
+                        fieldname = "spellclass-" + classidx + "-level-" + i + "-savedc";
+                        currDC = parseInt(v[fieldname], 10);
+                        newDC = dcBeforeLvl + i;
+                        //TAS.debug(" field " + fieldname + " is " + currDC + " but new is " + newDC);
+                        if (isNaN(currDC) || currDC !== newDC) {
+                            setter[fieldname] = newDC;
+                        }
+                        //TAS.debug("at " + i + ", the field to find is " + fieldname);
+                    }
+                    setAttrs(setter);
+                }
+            });
 
-    	});
+        });
     },
 
 
-	/* updateBonusSpells
-	* updates Bonus Spells for the class
-	* It looks at the attribute, not the attribute mod. So it does not change with ability damage or penalties.
-	*/
+    /* updateBonusSpells
+    * updates Bonus Spells for the class
+    * It looks at the attribute, not the attribute mod. So it does not change with ability damage or penalties.
+    */
     updateBonusSpells = function (classidx, eventInfo) {
-    	var conAbility = "Concentration-" + classidx + "-ability";
-    	getAttrs([conAbility, "INT", "WIS", "CHA", "STR", "DEX", "CON"], function (v) {
-    		//eliminate the modifier, we just want @{INT} not @{INT-mod}
-    		var abilityName = findAbilityInString(v[conAbility]).replace("-mod", "")
-				, abilityVal = parseInt(v[abilityName], 10)
-				, fields = {}, bonusSpells, bonusName, i, newRaw
-				, prefix = "spellclass-" + classidx + "-level-";
-    		if (isNaN(abilityVal)) {
-    			return;
-    		}
-    		if (abilityVal >= 12) {
-				//abilityVal -= 1;
-    			for (i = 1; i < 10; i++) {
-					//newRaw = Math.max(0, abilityVal - 10 - (2 * (i - 1)));
-					//bonusSpells = Math.ceil(newRaw / 8);
-					bonusSpells = Math.floor(Math.max(Math.floor((abilityVal - 10) / 2) + 4 - i), 0) / 4;
-    				bonusName = prefix + i + "-bonus";
-    				fields[bonusName] = bonusSpells;
-    			}
-    		} else {
-    			for (i = 1; i < 10; i++) {
-    				bonusName = prefix + i + "-bonus";
-    				fields[bonusName] = 0;
-    			}
-    		}
-    		setAttrs(fields, { silent: true });
-    	});
+        var conAbility = "Concentration-" + classidx + "-ability";
+        getAttrs([conAbility, "INT", "WIS", "CHA", "STR", "DEX", "CON"], function (v) {
+            //eliminate the modifier, we just want @{INT} not @{INT-mod}
+            var abilityName = findAbilityInString(v[conAbility]).replace("-mod", "")
+                , abilityVal = parseInt(v[abilityName], 10)
+                , fields = {}, bonusSpells, bonusName, i, newRaw
+                , prefix = "spellclass-" + classidx + "-level-";
+            if (isNaN(abilityVal)) {
+                return;
+            }
+            if (abilityVal >= 12) {
+                //abilityVal -= 1;
+                for (i = 1; i < 10; i++) {
+                    //newRaw = Math.max(0, abilityVal - 10 - (2 * (i - 1)));
+                    //bonusSpells = Math.ceil(newRaw / 8);
+                    bonusSpells = Math.floor(Math.max(Math.floor((abilityVal - 10) / 2) + 4 - i, 0) / 4);
+                    bonusName = prefix + i + "-bonus";
+                    fields[bonusName] = bonusSpells;
+                }
+            } else {
+                for (i = 1; i < 10; i++) {
+                    bonusName = prefix + i + "-bonus";
+                    fields[bonusName] = 0;
+                }
+            }
+            setAttrs(fields, { silent: true });
+        });
     },
 
-	/* updateMaxSpellsPerDay
-	*/
+    /* updateMaxSpellsPerDay
+    */
     updateMaxSpellsPerDay = function (classidx, spelllvl) {
-    	var fields = ["spellclass-" + classidx + "-level-" + spelllvl + "-spells-per-day_max"
+        var fields = ["spellclass-" + classidx + "-level-" + spelllvl + "-spells-per-day_max"
             , "spellclass-" + classidx + "-level-" + spelllvl + "-class"
             , "spellclass-" + classidx + "-level-" + spelllvl + "-bonus"
             , "spellclass-" + classidx + "-level-" + spelllvl + "-misc"];
-    	updateRowTotal(fields);
+        updateRowTotal(fields);
     },
 
     /******** SPELLS REPEATING SECTION ******/
 
-	/* updateSpell
-	* For a row in lvl-x-spells repeating sections, updates:
-	*  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, eventInfo, forceRange) {
-		var idStr = getRepeatingIDStr(id)
-			, prefix = "repeating_" + section + "_" + idStr
-			, spellclassField = prefix + "spellclass"
-			, spellLevelField = prefix + "spell_level"
-		;
-		//TAS.debug("At updateSpell prefix: " + prefix + ", classfield=" + spellclassField);
-		//TAS.debug(eventInfo);
-		getAttrs([spellLevelField, spellclassField, "spellclass-0-name", "spellclass-1-name", "spellclass-2-name"], function (va) {
-			var currSpellLevel = parseInt(va[spellLevelField], 10)
-				, spellLevel = isNaN(currSpellLevel) ? parseInt(section.substring(4), 10) : currSpellLevel
-				, classNum = findSpellClass(va[spellclassField], va["spellclass-0-name"], va["spellclass-1-name"], va["spellclass-2-name"]) || 0
-				, hasClass = (isNaN(classNum) || classNum < 0) ? false : true
-				, hiddenclassNumField = prefix + "spellclass_number"
-				, 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-mod"
-				, spellRangeText = prefix + "range"
-				, spellRangeNum = prefix + "range_numeric"
-				, spellRangeTarget = prefix + "targets";
-			//TAS.debug(va);
+    /* updateSpell
+    * For a row in lvl-x-spells repeating sections, updates:
+    *  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, eventInfo, forceRange) {
+        var idStr = getRepeatingIDStr(id)
+            , prefix = "repeating_" + section + "_" + idStr
+            , spellclassField = prefix + "spellclass"
+            , spellLevelField = prefix + "spell_level"
+        ;
+        //TAS.debug("At updateSpell prefix: " + prefix + ", classfield=" + spellclassField);
+        //TAS.debug(eventInfo);
+        getAttrs([spellLevelField, spellclassField, "spellclass-0-name", "spellclass-1-name", "spellclass-2-name"], function (va) {
+            var currSpellLevel = parseInt(va[spellLevelField], 10)
+                , spellLevel = isNaN(currSpellLevel) ? parseInt(section.substring(4), 10) : currSpellLevel
+                , classNum = findSpellClass(va[spellclassField], va["spellclass-0-name"], va["spellclass-1-name"], va["spellclass-2-name"]) || 0
+                , hasClass = (isNaN(classNum) || classNum < 0) ? false : true
+                , hiddenclassNumField = prefix + "spellclass_number"
+                , 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-mod"
+                , spellRangeText = prefix + "range"
+                , spellRangeNum = prefix + "range_numeric"
+                , spellRangeTarget = prefix + "targets";
+            //TAS.debug(va);
 
-			getAttrs([hiddenclassNumField, spellDCField, spellDCUserField, spellCLField, spellCLUserField
-				, spellConField, spellConUserField, spellDefConField, spellDefCastDCField
-				, spellSpellPenField, spellSpellPenUserField, classDCField, classCLField
-				, classConField, classDefConField, classSpellPenField
-				, spellRangeText, spellRangeNum, spellRangeTarget], 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)
-					, currClassNum = parseInt(v[hiddenclassNumField], 10)
-					, currRange = parseInt(v[spellRangeNum], 10)
-					, newRange = 0
-					, setter = {}, setAny = 0
-					, classLevelDelta = 0
-					, updateRange = false
-					;
-					if (classNum !== currClassNum || isNaN(currClassNum)) {
-						setter[hiddenclassNumField] = classNum;
-						setAny = 1;
-						updateRange = true;
-					}
+            getAttrs([hiddenclassNumField, spellDCField, spellDCUserField, spellCLField, spellCLUserField
+                , spellConField, spellConUserField, spellDefConField, spellDefCastDCField
+                , spellSpellPenField, spellSpellPenUserField, classDCField, classCLField
+                , classConField, classDefConField, classSpellPenField
+                , spellRangeText, spellRangeNum, spellRangeTarget], 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)
+                    , currClassNum = parseInt(v[hiddenclassNumField], 10)
+                    , currRange = parseInt(v[spellRangeNum], 10)
+                    , newRange = 0
+                    , setter = {}, setAny = 0
+                    , classLevelDelta = 0
+                    , updateRange = false
+                    ;
+                    if (classNum !== currClassNum || isNaN(currClassNum)) {
+                        setter[hiddenclassNumField] = classNum;
+                        setAny = 1;
+                        updateRange = true;
+                    }
 
-					//TAS.debug(v);
-					//Caster level check mod
-					newCL = (parseInt(v[spellCLUserField], 10) || 0) + classCL;
-					//TAS.debug("new class level: " + newCL + ", old class level = " + currCL + ", default class level:" + classCL);
-					if (newCL !== currCL || isNaN(currCL)) {
-						setter[spellCLField] = newCL;
-						setAny = 1;
-						//TAS.debug("caster level changed! that means range, concentration and spell pen change");
-						updateRange = true;
-					}
-					if (defDC !== currdefDC || isNaN(currdefDC)) {
-						setter[spellDefCastDCField] = defDC;
-						setAny = 1;
-					}
-					classLevelDelta = newCL - classCL;
-					//DC to save
-					newDC = (parseInt(v[spellDCUserField], 10) || 0) + classDC;
-					if (newDC !== currDC || isNaN(currDC)) {
-						setter[spellDCField] = newDC;
-						setAny = 1;
-					}
+                    //TAS.debug(v);
+                    //Caster level check mod
+                    newCL = (parseInt(v[spellCLUserField], 10) || 0) + classCL;
+                    //TAS.debug("new class level: " + newCL + ", old class level = " + currCL + ", default class level:" + classCL);
+                    if (newCL !== currCL || isNaN(currCL)) {
+                        setter[spellCLField] = newCL;
+                        setAny = 1;
+                        //TAS.debug("caster level changed! that means range, concentration and spell pen change");
+                        updateRange = true;
+                    }
+                    if (defDC !== currdefDC || isNaN(currdefDC)) {
+                        setter[spellDefCastDCField] = defDC;
+                        setAny = 1;
+                    }
+                    classLevelDelta = newCL - classCL;
+                    //DC to save
+                    newDC = (parseInt(v[spellDCUserField], 10) || 0) + classDC;
+                    if (newDC !== currDC || isNaN(currDC)) {
+                        setter[spellDCField] = newDC;
+                        setAny = 1;
+                    }
 
-					//Concentration check mod
-					newCon = (parseInt(v[spellConUserField], 10) || 0) + classCon + classLevelDelta;
-					if (newCon !== currCon || isNaN(currCon)) {
-						setter[spellConField] = newCon;
-						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 = 1;
-					}
+                    //Concentration check mod
+                    newCon = (parseInt(v[spellConUserField], 10) || 0) + classCon + classLevelDelta;
+                    if (newCon !== currCon || isNaN(currCon)) {
+                        setter[spellConField] = newCon;
+                        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 = 1;
+                    }
 
-					//Spell penetration check mod 
-					newSpellPen = classSpellPen + (parseInt(v[spellSpellPenUserField], 10) || 0) + classLevelDelta;
-					if (newSpellPen !== currSpellPen || isNaN(currSpellPen)) {
-						setter[spellSpellPenField] = newSpellPen;
-						setAny = 1;
-					}
+                    //Spell penetration check mod 
+                    newSpellPen = classSpellPen + (parseInt(v[spellSpellPenUserField], 10) || 0) + classLevelDelta;
+                    if (newSpellPen !== currSpellPen || isNaN(currSpellPen)) {
+                        setter[spellSpellPenField] = newSpellPen;
+                        setAny = 1;
+                    }
 
-					if (currSpellLevel !== spellLevel || isNaN(currSpellLevel)) {
-						setter[spellLevelField] = spellLevel;
-						setAny = 1;
-					}
-					if (updateRange || forceRange) {
-						newRange = findSpellRange(v[spellRangeText], calculateSpellRanges(newCL), v[spellRangeTarget], newCL);
-						if (newRange !== currRange || isNaN(currRange)) {
-							setter[spellRangeNum] = newRange;
-							setAny = 1;
-						}
-					}
+                    if (currSpellLevel !== spellLevel || isNaN(currSpellLevel)) {
+                        setter[spellLevelField] = spellLevel;
+                        setAny = 1;
+                    }
+                    if (updateRange || forceRange) {
+                        newRange = findSpellRange(v[spellRangeText], calculateSpellRanges(newCL), v[spellRangeTarget], newCL);
+                        if (newRange !== currRange || isNaN(currRange)) {
+                            setter[spellRangeNum] = newRange;
+                            setAny = 1;
+                        }
+                    }
 
-					if (setAny) {
-						setAttrs(setter, { silent: true });
-					}
-				});
-		});
+                    if (setAny) {
+                        setAttrs(setter, { silent: true });
+                    }
+                });
+        });
 
-	},
-
-
-	/*updateSpellRange
-	* Updates spell range for one row when the range or targets field is modified.
-	*/
-	updateSpellRange = function (section, id, eventInfo) {
-		var idStr = getRepeatingIDStr(id)
-			, prefix = "repeating_" + section + "_" + idStr;
-		getAttrs([prefix + "range", prefix + "range_numeric", prefix + "casterlevel", prefix + "targets"], function (v) {
-			var currRange = parseInt(v[prefix + "range_numeric"], 10)
-			, casterlevel = (parseInt(v[prefix + "casterlevel"], 10) || 0)
-
-			, newRange = findSpellRange(v[prefix + "range"], calculateSpellRanges(casterlevel), v[prefix + "targets"], casterlevel)
-			, setter = {};
-			if (newRange !== currRange || isNaN(currRange)) {
-				setter[prefix + "range_numeric"] = newRange;
-				setAttrs(setter, { silent: true });
-			}
-		});
-	},
-
-
-	/*updateSpells
-	* calls updateSpell for every row of the given spell section
-	* can call with either "lvl-0-spells", or with number of spell level
-	*/
-    updateSpells = function (section, eventInfo, forceRange) {
-    	var spelllvl = parseInt(section, 10);
-    	if (!isNaN(spelllvl)) {
-    		section = "lvl-" + spelllvl + "-spells";
-    	}
-    	getSectionIDs("repeating_" + section, function (ids) {
-    		ids.forEach(function (id, index) {
-    			updateSpell(section, id, eventInfo, forceRange);
-    		});
-    	});
     },
 
-	updateSpellsAll = function (spellClass, eventInfo, forceRange) {
-		var i = 0;
-		for (i = 0; i < 10; i++) {
-			updateSpells(i, eventInfo, forceRange);
-		}
-	},
+
+    /*updateSpellRange
+    * Updates spell range for one row when the range or targets field is modified.
+    */
+    updateSpellRange = function (section, id, eventInfo) {
+        var idStr = getRepeatingIDStr(id)
+            , prefix = "repeating_" + section + "_" + idStr;
+        getAttrs([prefix + "range", prefix + "range_numeric", prefix + "casterlevel", prefix + "targets"], function (v) {
+            var currRange = parseInt(v[prefix + "range_numeric"], 10)
+            , casterlevel = (parseInt(v[prefix + "casterlevel"], 10) || 0)
+
+            , newRange = findSpellRange(v[prefix + "range"], calculateSpellRanges(casterlevel), v[prefix + "targets"], casterlevel)
+            , setter = {};
+            if (newRange !== currRange || isNaN(currRange)) {
+                setter[prefix + "range_numeric"] = newRange;
+                setAttrs(setter, { silent: true });
+            }
+        });
+    },
+
+
+    /*updateSpells
+    * calls updateSpell for every row of the given spell section
+    * can call with either "lvl-0-spells", or with number of spell level
+    */
+    updateSpells = function (section, eventInfo, forceRange) {
+        var spelllvl = parseInt(section, 10);
+        if (!isNaN(spelllvl)) {
+            section = "lvl-" + spelllvl + "-spells";
+        }
+        getSectionIDs("repeating_" + section, function (ids) {
+            ids.forEach(function (id, index) {
+                updateSpell(section, id, eventInfo, forceRange);
+            });
+        });
+    },
+
+    updateSpellsAll = function (spellClass, eventInfo, forceRange) {
+        var i = 0;
+        for (i = 0; i < 10; i++) {
+            updateSpells(i, eventInfo, forceRange);
+        }
+    },
 
 
     /*********************************** ROW ********************************************/
 
-	/*checkIsNewRow - updates new_flag and id for a row. if a spell row calls updateSpell
-	* 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 - updates new_flag and id for a row. if a spell row calls updateSpell
+    * 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; }
-    	//TAS.debug("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 ((/lvl-.-spell/.test(section))) { updateSpell(section, eventInfo); }
-    		}
-    	});
+        if (!section || !eventInfo) { return; }
+        //TAS.debug("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 ((/lvl-.-spell/.test(section))) { updateSpell(section, eventInfo); }
+            }
+        });
     },
 
 
-	/***************************************** Lists of Fields ************************************************************/
-	//add any new repeating sections here. This is the word after "repeating_"
-	repeatingSections = [
-		 "weapon", "class-ability", "feat", "racial-trait", "trait", "item"
-		 , "lvl-0-spells", "lvl-1-spells", "lvl-2-spells", "lvl-3-spells", "lvl-4-spells"
-		 , "lvl-5-spells", "lvl-6-spells", "lvl-7-spells", "lvl-8-spells", "lvl-9-spells"
-		 , "npc-spell-like-abilities", "npc-spells1", "npc-spells2"
-	    , "mythic-ability", "mythic-feat", "buff"
-	],
-	//repeating sections that have used and used|max fields
-	repeatingMaxUseSections = [
-		"class-ability", "feat", "racial-trait", "trait", "npc-spell-like-abilities", "mythic-ability", "mythic-feat"
-	],
-	abilities = ["STR", "DEX", "CON", "INT", "WIS", "CHA"],
-	abilityEvents = "change:REPLACE-base change:REPLACE-enhance change:REPLACE-misc change:REPLACE-temp change:REPLACE-damage change:REPLACE-penalty change:REPLACE-drain change:REPLACE-cond",
-	abilityMods = ["STR-mod", "DEX-mod", "CON-mod", "INT-mod", "WIS-mod", "CHA-mod"],
-	conditionEvents = {
-		"change:condition-Sickened": [updateDamage, updateConditionCheckPenalty, updateConditionsSavePenalty, updateConditionAttackPenalty]
-		, "change:condition-stunned": [updateDefenses, updateConditionDefensePenalty]
-		, "change:condition-flat-footed": [updateDefenses, updateConditionDefensePenalty]
-		, "change:condition-deafened": [updateInit, updateCastingPenaltyNote]
-		, "change:condition-fatigued": [updateConditionAbilityPenalty]
-		, "change:condition-entangled": [updateConditionAbilityPenalty, updateConditionAttackPenalty]
-		, "change:condition-grappled": [updateGrapple, updateConditionAttackPenalty, updateConditionAttackNote]
-		, "change:condition-pinned": [updatePin, updateConditionDefensePenalty]
-		, "change:condition-drained": [updateHP, updateConditionCheckPenalty, updateConditionsSavePenalty, updateConditionAttackPenalty, updateConditionDefensePenalty]
-		, "change:condition-wounds": [updateConditionCheckPenalty, updateConditionsSavePenalty, updateConditionAttackPenalty, updateConditionDefensePenalty]
-		, "change:condition-fear": [updateConditionCheckPenalty, updateConditionsSavePenalty, updateConditionAttackPenalty]
-		, "change:condition-blinded": [updateConditionCheckPenalty, updateConditionDefensePenalty]
-		, "change:condition-cowering": [updateConditionDefensePenalty]
-		, "change:condition-invisible": [updateConditionAttackNote, updateDefenses, updateConditionDefensePenalty, updateConditionAttackPenalty]
-		, "change:condition-dazzled": [updateConditionAttackPenalty]
-		, "change:condition-prone": [updateConditionAttackPenalty]
-	},
-	//all possible buffs, add any new ones here
-	buffColumns = [
-		"STR", "DEX", "CON", "INT", "WIS", "CHA", "Ranged", "Melee", "DMG", "AC", "Touch", "CMD", "HP-temp"
-		, "Fort", "Will", "Ref", "Check", "CasterLevel"
-	],
-	buffEvents={
-		 "Ranged":[updateAttack],"Melee":[updateAttack],"DMG":[updateDamage]
-		,"Fort":[updateSave],"Will":[updateSave],"Ref":[updateSave]
-		,"STR":[updateAbility], "DEX":[updateAbility], "CON":[updateAbility], "INT":[updateAbility], "WIS":[updateAbility], "CHA":[updateAbility]
-	},
-	buffEventsNoParam={
-		 "AC":[updateDefenses],"Touch":[updateDefenses],"CMD":[updateDefenses]
-		,"HP-temp":[updateTempHP],"Check":[updateConditionCheckPenalty]
-	},	
-	//all columns in Classes grid
-	classColumns = ["hp", "skill", "fcskill", "fcalt", "bab", "Fort", "Ref", "Will", "level"],
-	//the classes available
-	classRows = ["0", "1", "2", "3", "4", "5"],
-	//GENERIC dropdowns that use handleDropdpown
-	//fieldname of dropdown, and fieldname of the number field to update,
-	dropdowns = {
-		"HP-ability": "HP-ability-mod"
-		, "init-ability": "init-ability-mod"
-		, "Fort-ability": "Fort-ability-mod"
-		, "Ref-ability": "Ref-ability-mod"
-		, "Will-ability": "Will-ability-mod"
-		, "melee-ability": "melee-ability-mod"
-		, "ranged-ability": "ranged-ability-mod"
-		, "CMB-ability": "CMB-ability-mod"
-	},
-	//Special defense tab dropdowns (since they are synced across each other)
-	//fieldname of dropdown, and fieldname of the number field to update,
-	defenseDropdowns = {
-		"AC-ability": "AC-ability-mod"
-		, "FF-ability": "FF-DEX"
-		, "CMD-ability1": "CMD-STR"
-		, "CMD-ability2": "CMD-DEX"
-		, "CMD-ability": "FF-CMD-DEX"
-	},
-	saveTypes = ["Fort", "Ref", "Will"],
-	saveEvents = "change:saves-cond change:total-REPLACE change:REPLACE-ability-mod change:REPLACE-trait change:REPLACE-enhance change:REPLACE-resist change:REPLACE-misc",
-	allCoreSkills = [
-		 "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"
-	],
-	//NEW skills for background in Unchained
-	backgroundSkills = ["Artistry", "Artistry2", "Artistry3", "Lore", "Lore2", "Lore3"],
-	//consolidated skills for Unchained
-	consolidatedSkills = [
-		 "CS-Acrobatics", "CS-Athletics", "CS-Finesse", "CS-Influence", "CS-Nature", "CS-Perception"
-		, "CS-Performance", "CS-Religion", "CS-Society", "CS-Spellcraft", "CS-Stealth", "CS-Survival"
-	],
-	//skills that depend on size, and 1 or 2:
-	//	1 is the normal size modifier in size_skill, 2 is size_skill_double
-	sizeSkills = { "Fly": 1, "Stealth": 2, "CS-Stealth": 2 },
-	skillEvents = "change:acp change:checks-cond change:phys-skills-cond change:REPLACE-mod change:REPLACE-cs change:REPLACE-ranks change:REPLACE-class change:REPLACE-ability change:REPLACE-racial change:REPLACE-feat change:REPLACE-item change:REPLACE-misc change:REPLACE-ReqTrain",
-	//the 3 spell classes at top of spells page
-	spellClassIndexes = ["0", "1", "2"],
-	//events for those 3 classes
-	//first is event string, second is array of methods to call, each much take classidx as first/only param
-	spellClassEvents = {
-		"change:spellclass-REPLACE": [handleSpellClassDropdown]
-		, "change:spellclass-REPLACE-level change:spellclass-REPLACE-level-misc change:buff_CasterLevel-total change:condition-Drained change:CasterLevel-Penalty": [updateCasterLevel]
-		, "change:concentration-REPLACE-ability": [handleConcentrationAbilityDropdown, updateBonusSpells]
-		, "change:concentration-REPLACE-mod": [updateSaveDCs, updateConcentration]
-		, "change:concentration-REPLACE-misc": [updateConcentration]
-		, "change:spellclass-REPLACE-SP_misc": [updateSpellPenetration]
-		, "change:spellclass-REPLACE-level-total": [updateConcentration, updateSpellPenetration, updateSpellClassRange]
-		, "change:concentration-REPLACE change:spellclass-REPLACE-SP-mod change:concentration-REPLACE-def": [updateSpellsAll]
-		//change:spellclass-0-level-total  don't need since this MUST update concentration-0
-	},
-	//spell levels for repeating spell sections
-	spellLevels = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
-	//events for repeating spells
-	//first is event string, second is array of methods to call, each much take spell level as first/only param
-	spellLevelEvents = {
-		"change:repeating_lvl-REPLACE-spells:range change:repeating_lvl-REPLACE-spells:targets": [updateSpellRange]
-		, "change:repeating_lvl-REPLACE-spells:name change:repeating_lvl-REPLACE-spells:spellclass change:repeating_lvl-REPLACE-spells:spell_level change:repeating_lvl-REPLACE-spells:DC_misc change:repeating_lvl-REPLACE-spells:CL_misc change:repeating_lvl-REPLACE-spells:SP_misc  change:repeating_lvl-REPLACE-spells:Concentration_misc": [updateSpell]
-	},
-	//events for updateBonusSpells CLASSIDX is the 0-2 classes, SPELLLEVEL is 0-9
-	spellClassLevelsEvents = "change:spellclass-CLASSIDX-level-SPELLLEVEL-class change:spellclass-CLASSIDX-level-SPELLLEVEL-bonus change:spellclass-CLASSIDX-level-SPELLLEVEL-misc",
+    /***************************************** Lists of Fields ************************************************************/
+    //add any new repeating sections here. This is the word after "repeating_"
+    repeatingSections = [
+         "weapon", "class-ability", "feat", "racial-trait", "trait", "item"
+         , "lvl-0-spells", "lvl-1-spells", "lvl-2-spells", "lvl-3-spells", "lvl-4-spells"
+         , "lvl-5-spells", "lvl-6-spells", "lvl-7-spells", "lvl-8-spells", "lvl-9-spells"
+         , "npc-spell-like-abilities", "npc-spells1", "npc-spells2"
+        , "mythic-ability", "mythic-feat", "buff"
+    ],
+    //repeating sections that have used and used|max fields
+    repeatingMaxUseSections = [
+        "class-ability", "feat", "racial-trait", "trait", "npc-spell-like-abilities", "mythic-ability", "mythic-feat"
+    ],
+    abilities = ["STR", "DEX", "CON", "INT", "WIS", "CHA"],
+    abilityEvents = "change:REPLACE-base change:REPLACE-enhance change:REPLACE-misc change:REPLACE-temp change:REPLACE-damage change:REPLACE-penalty change:REPLACE-drain change:REPLACE-cond",
+    abilityMods = ["STR-mod", "DEX-mod", "CON-mod", "INT-mod", "WIS-mod", "CHA-mod"],
+    conditionEvents = {
+        "change:condition-Sickened": [updateDamage, updateConditionCheckPenalty, updateConditionsSavePenalty, updateConditionAttackPenalty]
+        , "change:condition-stunned": [updateDefenses, updateConditionDefensePenalty]
+        , "change:condition-flat-footed": [updateDefenses, updateConditionDefensePenalty]
+        , "change:condition-deafened": [updateInit, updateCastingPenaltyNote]
+        , "change:condition-fatigued": [updateConditionAbilityPenalty]
+        , "change:condition-entangled": [updateConditionAbilityPenalty, updateConditionAttackPenalty]
+        , "change:condition-grappled": [updateGrapple, updateConditionAttackPenalty, updateConditionAttackNote]
+        , "change:condition-pinned": [updatePin, updateConditionDefensePenalty]
+        , "change:condition-drained": [updateHP, updateConditionCheckPenalty, updateConditionsSavePenalty, updateConditionAttackPenalty, updateConditionDefensePenalty]
+        , "change:condition-wounds": [updateConditionCheckPenalty, updateConditionsSavePenalty, updateConditionAttackPenalty, updateConditionDefensePenalty]
+        , "change:condition-fear": [updateConditionCheckPenalty, updateConditionsSavePenalty, updateConditionAttackPenalty]
+        , "change:condition-blinded": [updateConditionCheckPenalty, updateConditionDefensePenalty]
+        , "change:condition-cowering": [updateConditionDefensePenalty]
+        , "change:condition-invisible": [updateConditionAttackNote, updateDefenses, updateConditionDefensePenalty, updateConditionAttackPenalty]
+        , "change:condition-dazzled": [updateConditionAttackPenalty]
+        , "change:condition-prone": [updateConditionAttackPenalty]
+    },
+    //all possible buffs, add any new ones here
+    buffColumns = [
+        "STR", "DEX", "CON", "INT", "WIS", "CHA", "Ranged", "Melee", "DMG", "AC", "Touch", "CMD", "HP-temp"
+        , "Fort", "Will", "Ref", "Check", "CasterLevel"
+    ],
+    buffEvents={
+         "Ranged":[updateAttack],"Melee":[updateAttack],"DMG":[updateDamage]
+        ,"Fort":[updateSave],"Will":[updateSave],"Ref":[updateSave]
+        ,"STR":[updateAbility], "DEX":[updateAbility], "CON":[updateAbility], "INT":[updateAbility], "WIS":[updateAbility], "CHA":[updateAbility]
+    },
+    buffEventsNoParam={
+         "AC":[updateDefenses],"Touch":[updateDefenses],"CMD":[updateDefenses]
+        ,"HP-temp":[updateTempHP],"Check":[updateConditionCheckPenalty]
+    },  
+    //all columns in Classes grid
+    classColumns = ["hp", "fchp", "skill", "fcskill", "fcalt", "bab", "Fort", "Ref", "Will", "level"],
+    //the classes available
+    classRows = ["0", "1", "2", "3", "4", "5"],
+    //GENERIC dropdowns that use handleDropdpown
+    //fieldname of dropdown, and fieldname of the number field to update,
+    dropdowns = {
+        "HP-ability": "HP-ability-mod"
+        , "init-ability": "init-ability-mod"
+        , "Fort-ability": "Fort-ability-mod"
+        , "Ref-ability": "Ref-ability-mod"
+        , "Will-ability": "Will-ability-mod"
+        , "melee-ability": "melee-ability-mod"
+        , "ranged-ability": "ranged-ability-mod"
+        , "CMB-ability": "CMB-ability-mod"
+    },
+    //Special defense tab dropdowns (since they are synced across each other)
+    //fieldname of dropdown, and fieldname of the number field to update,
+    defenseDropdowns = {
+        "AC-ability": "AC-ability-mod"
+        , "FF-ability": "FF-DEX"
+        , "CMD-ability1": "CMD-STR"
+        , "CMD-ability2": "CMD-DEX"
+        , "CMD-ability": "FF-CMD-DEX"
+    },
+    saveTypes = ["Fort", "Ref", "Will"],
+    saveEvents = "change:saves-cond change:total-REPLACE change:REPLACE-ability-mod change:REPLACE-trait change:REPLACE-enhance change:REPLACE-resist change:REPLACE-misc",
+    allCoreSkills = [
+         "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"
+    ],
+    //NEW skills for background in Unchained
+    backgroundSkills = ["Artistry", "Artistry2", "Artistry3", "Lore", "Lore2", "Lore3"],
+    //consolidated skills for Unchained
+    consolidatedSkills = [
+         "CS-Acrobatics", "CS-Athletics", "CS-Finesse", "CS-Influence", "CS-Nature", "CS-Perception"
+        , "CS-Performance", "CS-Religion", "CS-Society", "CS-Spellcraft", "CS-Stealth", "CS-Survival"
+    ],
+    //skills that depend on size, and 1 or 2:
+    //  1 is the normal size modifier in size_skill, 2 is size_skill_double
+    sizeSkills = { "Fly": 1, "Stealth": 2, "CS-Stealth": 2 },
+    skillEvents = "change:acp change:checks-cond change:phys-skills-cond change:REPLACE-mod change:REPLACE-cs change:REPLACE-ranks change:REPLACE-class change:REPLACE-ability change:REPLACE-racial change:REPLACE-feat change:REPLACE-item change:REPLACE-misc change:REPLACE-ReqTrain",
+    //the 3 spell classes at top of spells page
+    spellClassIndexes = ["0", "1", "2"],
+    //events for those 3 classes
+    //first is event string, second is array of methods to call, each much take classidx as first/only param
+    spellClassEvents = {
+        "change:spellclass-REPLACE": [handleSpellClassDropdown]
+        , "change:spellclass-REPLACE-level change:spellclass-REPLACE-level-misc change:buff_CasterLevel-total change:condition-Drained change:CasterLevel-Penalty": [updateCasterLevel]
+        , "change:concentration-REPLACE-ability": [handleConcentrationAbilityDropdown, updateBonusSpells]
+        , "change:concentration-REPLACE-mod": [updateSaveDCs, updateConcentration]
+        , "change:concentration-REPLACE-misc": [updateConcentration]
+        , "change:spellclass-REPLACE-SP_misc": [updateSpellPenetration]
+        , "change:spellclass-REPLACE-level-total": [updateConcentration, updateSpellPenetration, updateSpellClassRange]
+        , "change:concentration-REPLACE change:spellclass-REPLACE-SP-mod change:concentration-REPLACE-def": [updateSpellsAll]
+        //change:spellclass-0-level-total  don't need since this MUST update concentration-0
+    },
+    //spell levels for repeating spell sections
+    spellLevels = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
+    //events for repeating spells
+    //first is event string, second is array of methods to call, each much take spell level as first/only param
+    spellLevelEvents = {
+        "change:repeating_lvl-REPLACE-spells:range change:repeating_lvl-REPLACE-spells:targets": [updateSpellRange]
+        , "change:repeating_lvl-REPLACE-spells:name change:repeating_lvl-REPLACE-spells:spellclass change:repeating_lvl-REPLACE-spells:spell_level change:repeating_lvl-REPLACE-spells:DC_misc change:repeating_lvl-REPLACE-spells:CL_misc change:repeating_lvl-REPLACE-spells:SP_misc  change:repeating_lvl-REPLACE-spells:Concentration_misc": [updateSpell]
+    },
+    //events for updateBonusSpells CLASSIDX is the 0-2 classes, SPELLLEVEL is 0-9
+    spellClassLevelsEvents = "change:spellclass-CLASSIDX-level-SPELLLEVEL-class change:spellclass-CLASSIDX-level-SPELLLEVEL-bonus change:spellclass-CLASSIDX-level-SPELLLEVEL-misc",
     wornEquipmentRows = ["Belt", "Body", "Chest", "Eyes", "Feet", "Hands", "Head", "Headband", "Neck", "Ring1", "Ring2", "Shoulders", "Wrist"],
     wornEquipmentColumns = ["charges", "weight", "hp", "hp_max", "value"],
     defenseArmorShieldRows = ["armor", "armor2", "armor3", "shield", "shield2", "shield3"],
     defenseArmorShieldColumns = ["equipped", "acbonus", "max-dex", "acp", "spell-fail", "proficiency"],
 
-	/************************************************ RECALCULATE  PAGES  to account for updates  *****************/
+    /************************************************ RECALCULATE  PAGES  to account for updates  *****************/
 
-	/*recalculateSpell sets spell level because it is now modifiable 
-	* ensures that spell_level is set on each spell repeating row, since it was changed to an editable field
-	* @section the spell level "lvl-0-spells", "lvl-1-spells", .... , "lvl-9-spells"
-	*/
-	recalculateSpellLevel = 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),
-			spellLevel = parseInt(section.substring(4), 10);
+    /*recalculateSpell sets spell level because it is now modifiable 
+    * ensures that spell_level is set on each spell repeating row, since it was changed to an editable field
+    * @section the spell level "lvl-0-spells", "lvl-1-spells", .... , "lvl-9-spells"
+    */
+    recalculateSpellLevel = 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),
+            spellLevel = parseInt(section.substring(4), 10);
 
-			if (isNaN(currLevel) && !isNaN(spellLevel)) {
-				setter[spellLevelField] = spellLevel;
-				setAttrs(setter);
-			}
-		});
-	},
+            if (isNaN(currLevel) && !isNaN(spellLevel)) {
+                setter[spellLevelField] = spellLevel;
+                setAttrs(setter);
+            }
+        });
+    },
 
-	/*recalculateSpellLevels - for all spell repeating sections of a level 0,..,9 calls recalculateSpell and updateSpell
-	* @spellLevel {int} = the DEFAULT spell level of the repeating section, from 0 to 9
-	*/
+    /*recalculateSpellLevels - for all spell repeating sections of a level 0,..,9 calls recalculateSpell and updateSpell
+    * @spellLevel {int} = the DEFAULT spell level of the repeating section, from 0 to 9
+    */
     recalculateSpellLevels = function (section, force) {
-    	var spelllvl = parseInt(section, 10);
-    	if (!isNaN(spelllvl)) {
-    		section = "lvl-" + spelllvl + "-spells";
-    	}
-    	getSectionIDs("repeating_" + section, function (ids) {
-    		ids.forEach(function (id, index) {
-    			recalculateSpellLevel(section, id);
-    		});
-    	});
+        var spelllvl = parseInt(section, 10);
+        if (!isNaN(spelllvl)) {
+            section = "lvl-" + spelllvl + "-spells";
+        }
+        getSectionIDs("repeating_" + section, function (ids) {
+            ids.forEach(function (id, index) {
+                recalculateSpellLevel(section, id);
+            });
+        });
     },
 
-	/*recalculateSpellLevelsAll calls recalculateSpellLevels for each spell levels 0-9 */
-	recalculateSpellLevelsAll = function (force) {
-		var i = 0;
-		for (i = 0; i < 10; i++) {
-			recalculateSpellLevels(i, force);
-		}
-	},
+    /*recalculateSpellLevelsAll calls recalculateSpellLevels for each spell levels 0-9 */
+    recalculateSpellLevelsAll = function (force) {
+        var i = 0;
+        for (i = 0; i < 10; i++) {
+            recalculateSpellLevels(i, force);
+        }
+    },
 
-	recalculateSpell_RangeClass = function (section, id, eventInfo) {
-		var idStr = getRepeatingIDStr(id)
-			, prefix = "repeating_" + section + "_" + idStr
-			, spellclassField = prefix + "spellclass"
-			, hiddenclassNumField = prefix + "spellclass_number";
-		getAttrs([spellclassField, hiddenclassNumField, "spellclass-0-name", "spellclass-1-name", "spellclass-2-name"
-			, prefix + "range", prefix + "range_numeric", prefix + "casterlevel", prefix + "targets"], function (v) {
-				var currClassNum = parseInt(v[hiddenclassNumField], 10)
-					, classNum = findSpellClass(v[spellclassField], v["spellclass-0-name"], v["spellclass-1-name"], v["spellclass-2-name"]) || 0
-					, currRange = parseInt(v[prefix + "range_numeric"], 10)
-					, casterlevel = (parseInt(v[prefix + "casterlevel"], 10) || 0)
-					, newRange = findSpellRange(prefix + "range", calculateSpellRanges(casterlevel), prefix + "targets", casterlevel)
-					, setter = {}, setAny = 0;
+    recalculateSpell_RangeClass = function (section, id, eventInfo) {
+        var idStr = getRepeatingIDStr(id)
+            , prefix = "repeating_" + section + "_" + idStr
+            , spellclassField = prefix + "spellclass"
+            , hiddenclassNumField = prefix + "spellclass_number";
+        getAttrs([spellclassField, hiddenclassNumField, "spellclass-0-name", "spellclass-1-name", "spellclass-2-name"
+            , prefix + "range", prefix + "range_numeric", prefix + "casterlevel", prefix + "targets"], function (v) {
+                var currClassNum = parseInt(v[hiddenclassNumField], 10)
+                    , classNum = findSpellClass(v[spellclassField], v["spellclass-0-name"], v["spellclass-1-name"], v["spellclass-2-name"]) || 0
+                    , currRange = parseInt(v[prefix + "range_numeric"], 10)
+                    , casterlevel = (parseInt(v[prefix + "casterlevel"], 10) || 0)
+                    , newRange = findSpellRange(prefix + "range", calculateSpellRanges(casterlevel), prefix + "targets", casterlevel)
+                    , setter = {}, setAny = 0;
 
-				if (newRange !== currRange || isNaN(currRange)) {
-					setter[prefix + "range_numeric"] = newRange;
-					setAny = 1;
-				}
-				if (classNum !== currClassNum || isNaN(currClassNum)) {
-					setter[hiddenclassNumField] = classNum;
-					setAny = 1;
-				}
-				if (setAny) { setAttrs(setter, { silent: true }); }
+                if (newRange !== currRange || isNaN(currRange)) {
+                    setter[prefix + "range_numeric"] = newRange;
+                    setAny = 1;
+                }
+                if (classNum !== currClassNum || isNaN(currClassNum)) {
+                    setter[hiddenclassNumField] = classNum;
+                    setAny = 1;
+                }
+                if (setAny) { setAttrs(setter, { silent: true }); }
 
-			});
-	},
+            });
+    },
 
-	/* recalc the whole spell except level - calls updateSpell */
+    /* recalc the whole spell except level - calls updateSpell */
     recalculateSpells_RangeClass = function (section, force) {
-    	var spelllvl = parseInt(section, 10);
-    	if (!isNaN(spelllvl)) {
-    		section = "lvl-" + spelllvl + "-spells";
-    	}
-    	getSectionIDs("repeating_" + section, function (ids) {
-    		ids.forEach(function (id, index) {
-    			recalculateSpell_RangeClass(section, id, null, force);
-    		});
-    	});
+        var spelllvl = parseInt(section, 10);
+        if (!isNaN(spelllvl)) {
+            section = "lvl-" + spelllvl + "-spells";
+        }
+        getSectionIDs("repeating_" + section, function (ids) {
+            ids.forEach(function (id, index) {
+                recalculateSpell_RangeClass(section, id, null, force);
+            });
+        });
     },
 
-	/* recalc the whole spell except level */
-	recalculateSpells_RangeClassAll = function (force) {
-		var i = 0;
-		for (i = 0; i < 10; i++) {
-			recalculateSpells_RangeClass(i, force);
-		}
-	},
+    /* recalc the whole spell except level */
+    recalculateSpells_RangeClassAll = function (force) {
+        var i = 0;
+        for (i = 0; i < 10; i++) {
+            recalculateSpells_RangeClass(i, force);
+        }
+    },
 
     /* recalculateRepeatingWeapons-  recalculates all repeating weapons rows.   */
     recalculateRepeatingWeapons = function () {
-    	getAttrs(["attk-effect-total", "dmg-effect-total", "DMG-mod"], function (v) {
-    		getSectionIDs("repeating_weapon", function (ids) {
-    			ids.forEach(function (id, index) {
-    				var prefix = "repeating_weapon_" + id + "_";
-    				if (isBadRowId("weapon", id, false)) {
-    					TAS.error("recalculateRepeatingWeapons, invalid id:" + id + ", index:" + index);
-    					return;
-    				}
-    				//TAS.debug("TRACE: recalculateRepeatingWeapons id=" + id);
-    				SWUtils.setAttributeNumber(prefix + "attk-effect-total-copy", (parseInt(v["attk-effect-total"], 10) || 0));
-    				SWUtils.setAttributeNumber(prefix + "dmg-effect-total-copy", (parseInt(v["dmg-effect-total"], 10) || 0));
-    				SWUtils.setAttributeNumber(prefix + "DMG-mod-copy", (parseInt(v["DMG-mod"], 10) || 0));
-    				SWUtils.evaluateAndSetNumber(prefix + "damage", prefix + "damage-mod");
-    				SWUtils.evaluateAndSetNumber(prefix + "attack", prefix + "attack-mod");
-    				handleDropdown(prefix + "attack-type", prefix + "attack-type-mod");
-    				handleRepeatingDamageDropdown(id);
-    				updateRepeatingWeaponAttack(id);
-    				updateRepeatingWeaponDamage(id);
-    			});
-    		});
-    	});
+        getAttrs(["attk-effect-total", "dmg-effect-total", "DMG-mod"], function (v) {
+            getSectionIDs("repeating_weapon", function (ids) {
+                ids.forEach(function (id, index) {
+                    var prefix = "repeating_weapon_" + id + "_";
+                    if (isBadRowId("weapon", id, false)) {
+                        TAS.error("recalculateRepeatingWeapons, invalid id:" + id + ", index:" + index);
+                        return;
+                    }
+                    //TAS.debug("TRACE: recalculateRepeatingWeapons id=" + id);
+                    SWUtils.setAttributeNumber(prefix + "attk-effect-total-copy", (parseInt(v["attk-effect-total"], 10) || 0));
+                    SWUtils.setAttributeNumber(prefix + "dmg-effect-total-copy", (parseInt(v["dmg-effect-total"], 10) || 0));
+                    SWUtils.setAttributeNumber(prefix + "DMG-mod-copy", (parseInt(v["DMG-mod"], 10) || 0));
+                    SWUtils.evaluateAndSetNumber(prefix + "damage", prefix + "damage-mod");
+                    SWUtils.evaluateAndSetNumber(prefix + "attack", prefix + "attack-mod");
+                    handleDropdown(prefix + "attack-type", prefix + "attack-type-mod");
+                    handleRepeatingDamageDropdown(id);
+                    updateRepeatingWeaponAttack(id);
+                    updateRepeatingWeaponDamage(id);
+                });
+            });
+        });
     },
 
     /* recalculateRepeatingMaxUsed - Parses the macro text "...max-calculation" in the repeating items 
-	* (such as class-abilities, feats, traits, racial-traits)
+    * (such as class-abilities, feats, traits, racial-traits)
     * and sets the used|max value.
     * Loops through all rows in the given repeating section.
     * @section {string}= the name of the section after the word "repeating_"
     */
     recalculateRepeatingMaxUsed = function (section) {
-    	getSectionIDs("repeating_" + section, function (ids) {
-    		ids.forEach(function (id, index) {
-    			var prefix = "repeating_" + section + "_" + id;
-    			if (isBadRowId(section, id, false)) {
-    				TAS.error("recalculateRepeatingMaxUsed, invalid id:" + id + ", index:" + index);
-    				return;
-    			}
-    			SWUtils.evaluateAndSetNumber(prefix + "_max-calculation", prefix + "_used_max");
-    		});
-    	});
+        getSectionIDs("repeating_" + section, function (ids) {
+            ids.forEach(function (id, index) {
+                var prefix = "repeating_" + section + "_" + id;
+                if (isBadRowId(section, id, false)) {
+                    TAS.error("recalculateRepeatingMaxUsed, invalid id:" + id + ", index:" + index);
+                    return;
+                }
+                SWUtils.evaluateAndSetNumber(prefix + "_max-calculation", prefix + "_used_max");
+            });
+        });
     },
 
-	recalculateSkillArray = function (skills) {
-		skills.forEach(function (skill, index) {
-			var ability = skill + "-ability", abilitymod = ability + "-mod";
-			handleDropdown(ability, abilitymod, function (abilityModValue) { updateSkill(skill); }, true);
-		});
-	},
-	/* recalculateSkills - updates ALL skills  - calls handleDropdown for ability then updateSkill 
-	*  */
+    recalculateSkillArray = function (skills) {
+        skills.forEach(function (skill, index) {
+            var ability = skill + "-ability", abilitymod = ability + "-mod";
+            handleDropdown(ability, abilitymod, function (abilityModValue) { updateSkill(skill); }, true);
+        });
+    },
+    /* recalculateSkills - updates ALL skills  - calls handleDropdown for ability then updateSkill 
+    *  */
     recalculateSkills = function () {
-    	getAttrs(["attr_unchained_skills-show", "BG-Skill-Use"], function (uv) {
-    		if (uv["attr_unchained_skills-show"] == "1") {
-    			if (uv["BG-Skill-Use"] == "1") {
-    				recalculateSkillArray(allCoreSkills);
-    				recalculateSkillArray(backgroundSkills);
-    			} else {
-    				recalculateSkillArray(consolidatedSkills);
-    			}
-    		} else {
-    			recalculateSkillArray(allCoreSkills);
-    		}
-    	});
+        getAttrs(["attr_unchained_skills-show", "BG-Skill-Use"], function (uv) {
+            if (uv["attr_unchained_skills-show"] == "1") {
+                if (uv["BG-Skill-Use"] == "1") {
+                    recalculateSkillArray(allCoreSkills);
+                    recalculateSkillArray(backgroundSkills);
+                } else {
+                    recalculateSkillArray(consolidatedSkills);
+                }
+            } else {
+                recalculateSkillArray(allCoreSkills);
+            }
+        });
     },
 
-	/* fixClassSkill - updates the class skill checkbox from that long string to a number 0 or 3
-		from the original sheet	*/
-	fixClassSkill = function (skill) {
-		var csNm = skill + "-cs";
-		getAttrs([csNm], function (v) {
-			var cs = 0, setter = {};
-			cs = parseInt(v[csNm], 10);
-			if (isNaN(cs)) {
-				if (v[csNm] == "0") { cs = 0; }
-				else if (v[csNm]) { cs = 3; }
-				else if (!v[csNm]) { cs = 0; }
-				if (cs === 3) {
-					//TAS.debug({"function":"fixClassSkill","raw":v[csNm],"cs":cs});
-					setter[csNm] = cs;
-					setAttrs(setter);
-				}
-			}
-		});
-	},
-	fixClassSkillArray = function (skills) {
-		skills.forEach(function (skill) {
-			fixClassSkill(skill);
-		});
-	},
-	/* fixClassSkills calls fixClassSkill for all skills */
-	fixClassSkills = function () {
-		getAttrs(["attr_unchained_skills-show", "BG-Skill-Use"], function (uv) {
-			if (uv["attr_unchained_skills-show"] == "1") {
-				if (uv["BG-Skill-Use"] == "1") {
-					fixClassSkillArray(allCoreSkills);
-					fixClassSkillArray(backgroundSkills);
-				} else {
-					fixClassSkillArray(consolidatedSkills);
-				}
-			} else {
-				fixClassSkillArray(allCoreSkills);
-			}
-		});
-	},
+    /* fixClassSkill - updates the class skill checkbox from that long string to a number 0 or 3
+        from the original sheet */
+    fixClassSkill = function (skill) {
+        var csNm = skill + "-cs";
+        getAttrs([csNm], function (v) {
+            var cs = 0, setter = {};
+            cs = parseInt(v[csNm], 10);
+            if (isNaN(cs)) {
+                if (v[csNm] == "0") { cs = 0; }
+                else if (v[csNm]) { cs = 3; }
+                else if (!v[csNm]) { cs = 0; }
+                if (cs === 3) {
+                    //TAS.debug({"function":"fixClassSkill","raw":v[csNm],"cs":cs});
+                    setter[csNm] = cs;
+                    setAttrs(setter);
+                }
+            }
+        });
+    },
+    fixClassSkillArray = function (skills) {
+        skills.forEach(function (skill) {
+            fixClassSkill(skill);
+        });
+    },
+    /* fixClassSkills calls fixClassSkill for all skills */
+    fixClassSkills = function () {
+        getAttrs(["attr_unchained_skills-show", "BG-Skill-Use"], function (uv) {
+            if (uv["attr_unchained_skills-show"] == "1") {
+                if (uv["BG-Skill-Use"] == "1") {
+                    fixClassSkillArray(allCoreSkills);
+                    fixClassSkillArray(backgroundSkills);
+                } else {
+                    fixClassSkillArray(consolidatedSkills);
+                }
+            } else {
+                fixClassSkillArray(allCoreSkills);
+            }
+        });
+    },
 
-	/* recalculateSheet - all pages in sheet!  */
+    /* recalculateSheet - all pages in sheet!  */
     recalculateSheet = function (oldversion) {
-    	if (oldversion < 0.15) {
+        if (oldversion < 0.15) {
 
-    		abilities.forEach(function (attr) {
-				updateAbility(attr, null);
-    		});
+            abilities.forEach(function (attr) {
+                updateAbility(attr, null);
+            });
 
-    		_.each(dropdowns, function (value, key) {
-				handleDropdown(key, value);
-    		});
-    		classColumns.forEach(function (col) {
-    			updateClassInformation(col);
-    		});
+            _.each(dropdowns, function (value, key) {
+                handleDropdown(key, value);
+            });
+            classColumns.forEach(function (col) {
+                updateClassInformation(col);
+            });
 
 
-    		updateInit();
-    		SWUtils.evaluateAndSetNumber("HP-formula-macro-text", "HP-formula-mod");
-    		updateHP();
-    		updateTempHP();
-    		SWUtils.evaluateAndSetNumber("NPC-HD-misc", "NPC-HD-misc-mod");
-    		updateNPCHP();
+            updateInit();
+            SWUtils.evaluateAndSetNumber("HP-formula-macro-text", "HP-formula-mod");
+            updateHP();
+            updateTempHP();
+            SWUtils.evaluateAndSetNumber("NPC-HD-misc", "NPC-HD-misc-mod");
+            updateNPCHP();
 
 
-    		updateSave("Fort");
-    		updateSave("Ref");
-    		updateSave("Will");
-    		updateConditionDefensePenalty();
-    		updateArmor();
-    		updateConditionAttackPenalty();
-    		updateAttack("Melee");
-    		updateAttack("Ranged");
-    		updateAttack("CMB");
-    		recalculateRepeatingWeapons();
-    	}
-    	if (oldversion < 0.16) {
-    		SWUtils.evaluateAndSetNumber("Max-Skill-Ranks-Misc", "Max-Skill-Ranks-mod");
-    		updateMaxSkills();
+            updateSave("Fort");
+            updateSave("Ref");
+            updateSave("Will");
+            updateConditionDefensePenalty();
+            updateArmor();
+            updateConditionAttackPenalty();
+            updateAttack("Melee");
+            updateAttack("Ranged");
+            updateAttack("CMB");
+            recalculateRepeatingWeapons();
+        }
+        if (oldversion < 0.16) {
+            SWUtils.evaluateAndSetNumber("Max-Skill-Ranks-Misc", "Max-Skill-Ranks-mod");
+            updateMaxSkills();
 
-    		updateConditionCheckPenalty();
-    		recalculateSkills();
-    		updateConditionAbilityPenalty();
-    	}
-    	if (oldversion < 0.17) {
-    		//skills fixed in 0.17
-    		if (oldversion > 0) {
-    			//redo 
-    			updateSkill("CS-Perception");
-    		}
-    		updateConditionAbilityPenalty();
-    		recalculateRepeatingMaxUsed("class-ability");
-    		recalculateRepeatingMaxUsed("feat");
-    		recalculateRepeatingMaxUsed("racial-trait");
-    		recalculateRepeatingMaxUsed("trait");
-    	}
-    	if (oldversion < 0.18) {
-    		fixClassSkills();
-    	}
-    	if (oldversion < 0.19) {
-    		updateDamage();
-    		updateDamageNote();
-    	}
-    	if (oldversion < 0.20) {
-    		recalculateRepeatingWeapons();
-    		handleRepeatingRowOrdering("class-ability", true);
-    		handleRepeatingRowOrdering("feat", true);
-    		handleRepeatingRowOrdering("racial-trait", true);
-    		handleRepeatingRowOrdering("trait", true);
-    		handleRepeatingRowOrdering("item", true);
-    	}
-    	if (oldversion < 0.21) {
-    		_.each(defenseDropdowns, function (value, key) {
-    			handleDefenseDropdown(key);
-    		});
-    		updateDefenses();
-    	}
-    	if (oldversion < 0.30) {
-    		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);
-    	}
-    	if (oldversion < 0.31) {
-    		updateConditionCheckPenalty();
-    		updateConditionDefensePenalty();
-    	}
-    	if (oldversion < 0.32) {
-    		ifSpellClassExists(0, function () {
-				handleSpellClassDropdown(0);
-    			handleConcentrationAbilityDropdown(0);
-    			updateCasterLevel(0);
-    			updateConcentration(0);
-    			updateSaveDCs(0);
-    		});
-    		ifSpellClassExists(1, function () {
-				handleSpellClassDropdown(1);
-    			handleConcentrationAbilityDropdown(1);
-    			updateCasterLevel(1);
-    			updateConcentration(1);
-    			updateSaveDCs(1);
-    		});
-    		ifSpellClassExists(2, function () {
-				handleSpellClassDropdown(2);
-    			handleConcentrationAbilityDropdown(2);
-    			updateCasterLevel(2);
-    			updateConcentration(2);
-    			updateSaveDCs(2);
-    		});
-    		recalculateSpellLevelsAll();
-    	}
-    	if (oldversion < 0.33) {
-    		handleRepeatingRowOrdering("mythic-ability", true);
-    		handleRepeatingRowOrdering("mythic-feat", true);
-    		recalculateRepeatingMaxUsed("mythic-ability");
-    		recalculateRepeatingMaxUsed("mythic-feat");
-    	}
-    	if (oldversion < 0.34) {
-    		ifSpellClassExists(0, function () { updateBonusSpells(0); });
-    		ifSpellClassExists(1, function () { updateBonusSpells(1); });
-    		ifSpellClassExists(2, function () { updateBonusSpells(2); });
-    	}
-    	if (oldversion < 0.35) {
-    		recalculateSpells_RangeClassAll(true);
-    		ifSpellClassExists(0, function () { updateSpellClassRange(0); });
-    		ifSpellClassExists(1, function () { updateSpellClassRange(1); });
-    		ifSpellClassExists(2, function () { updateSpellClassRange(2); });
-    	}
-    	if (oldversion < 0.36) {
-    		updateSpellsAll(null, null, true);
-    	}
-    	if (oldversion < 0.37) {
-    		updateModifiedSpeed();
+            updateConditionCheckPenalty();
+            recalculateSkills();
+            updateConditionAbilityPenalty();
+        }
+        if (oldversion < 0.17) {
+            //skills fixed in 0.17
+            if (oldversion > 0) {
+                //redo 
+                updateSkill("CS-Perception");
+            }
+            updateConditionAbilityPenalty();
+            recalculateRepeatingMaxUsed("class-ability");
+            recalculateRepeatingMaxUsed("feat");
+            recalculateRepeatingMaxUsed("racial-trait");
+            recalculateRepeatingMaxUsed("trait");
+        }
+        if (oldversion < 0.18) {
+            fixClassSkills();
+        }
+        if (oldversion < 0.19) {
+            updateDamage();
+            updateDamageNote();
+        }
+        if (oldversion < 0.20) {
+            recalculateRepeatingWeapons();
+            handleRepeatingRowOrdering("class-ability", true);
+            handleRepeatingRowOrdering("feat", true);
+            handleRepeatingRowOrdering("racial-trait", true);
+            handleRepeatingRowOrdering("trait", true);
+            handleRepeatingRowOrdering("item", true);
+        }
+        if (oldversion < 0.21) {
+            _.each(defenseDropdowns, function (value, key) {
+                handleDefenseDropdown(key);
+            });
+            updateDefenses();
+        }
+        if (oldversion < 0.30) {
+            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);
+        }
+        if (oldversion < 0.31) {
+            updateConditionCheckPenalty();
+            updateConditionDefensePenalty();
+        }
+        if (oldversion < 0.32) {
+            ifSpellClassExists(0, function () {
+                handleSpellClassDropdown(0);
+                handleConcentrationAbilityDropdown(0);
+                updateCasterLevel(0);
+                updateConcentration(0);
+                updateSaveDCs(0);
+            });
+            ifSpellClassExists(1, function () {
+                handleSpellClassDropdown(1);
+                handleConcentrationAbilityDropdown(1);
+                updateCasterLevel(1);
+                updateConcentration(1);
+                updateSaveDCs(1);
+            });
+            ifSpellClassExists(2, function () {
+                handleSpellClassDropdown(2);
+                handleConcentrationAbilityDropdown(2);
+                updateCasterLevel(2);
+                updateConcentration(2);
+                updateSaveDCs(2);
+            });
+            recalculateSpellLevelsAll();
+        }
+        if (oldversion < 0.33) {
+            handleRepeatingRowOrdering("mythic-ability", true);
+            handleRepeatingRowOrdering("mythic-feat", true);
+            recalculateRepeatingMaxUsed("mythic-ability");
+            recalculateRepeatingMaxUsed("mythic-feat");
+        }
+        if (oldversion < 0.34) {
+            //ifSpellClassExists(0, function () { updateBonusSpells(0); });
+            //ifSpellClassExists(1, function () { updateBonusSpells(1); });
+            //ifSpellClassExists(2, function () { updateBonusSpells(2); });
+        }
+        if (oldversion < 0.35) {
+            recalculateSpells_RangeClassAll(true);
+            ifSpellClassExists(0, function () { updateSpellClassRange(0); });
+            ifSpellClassExists(1, function () { updateSpellClassRange(1); });
+            ifSpellClassExists(2, function () { updateSpellClassRange(2); });
+        }
+        if (oldversion < 0.36) {
+            updateSpellsAll(null, null, true);
+        }
+        if (oldversion < 0.37) {
+            updateCarriedCurrency();
+            updateLoadsAndLift();
+        }
+        if (oldversion < 0.4) {
+            // Find old buff data then create repeating_buff entries for them then clear out old attributes
+            if (oldversion > 0) {
+                migrateBuffs();
+                recalculateAllBuffs();
+            }
+            updateSize();
+        }
+        if (oldversion < 0.41 ) {
+            buffColumns.forEach(function (col) {
+                PFSheet.updateBuffTotals(col);
+            });
+            updateArmor();
+        }
+        if (oldversion < 0.42 ) {
+
+            updateArmor();
+            //update for float
             wornEquipmentColumns.forEach(function (column) {
-			    updateWornEquipment(column);
+                updateWornEquipment(column);
             });
-			updateRepeatingItems();
+            updateRepeatingItems();
     
-    		updateCarriedCurrency();
-    		updateCarriedTotal();
-    		updateLoadsAndLift();
-    		updateCurrentLoad();
-    	}
-    	if (oldversion < 0.4) {
-    		// Find old buff data then create repeating_buff entries for them then clear out old attributes
-    		migrateBuffs();
-    		recalculateAllBuffs();
-			updateSize();
-		}
-		if (oldversion < 0.41 ) {
-			buffColumns.forEach(function (col) {
-				PFSheet.updateBuffTotals(col);
-			});
-			updateArmor();
-		}
-		if (oldversion < 0.42 ) {
-
-			updateArmor();
-			//update for float
-			wornEquipmentColumns.forEach(function (column) {
-			    updateWornEquipment(column);
-            });
-			updateRepeatingItems();
-    
-    		updateCarriedTotal();
-    		updateLoadsAndLift();
-    		updateCurrentLoad();			
-		}
+            updateCarriedTotal();
+            updateLoadsAndLift();
+            updateCurrentLoad();            
+        }
+        if (oldversion < 0.43 ) {
+            updateModifiedSpeed();
+            ifSpellClassExists(0, function () { updateBonusSpells(0); });
+            ifSpellClassExists(1, function () { updateBonusSpells(1); });
+            ifSpellClassExists(2, function () { updateBonusSpells(2); });
+        }       
     },
 
 
-	/* checkForUpdate looks at current version of page in PFSheet_Version and compares to code PFSheet.version 
-	*  calls recalulateSheet if versions don't match or if recalculate button was pressed.
-	 */
+    /* checkForUpdate looks at current version of page in PFSheet_Version and compares to code PFSheet.version 
+    *  calls recalulateSheet if versions don't match or if recalculate button was pressed.
+     */
     checkForUpdate = function () {
-    	getAttrs(["PFSheet_Version", "PFSheet_forcesync", "recalc1"], function (v) {
-    		var setter = {}, currVer = 0, setAny = 0, recalc = false;
-    		currVer = parseFloat(v["PFSheet_Version"], 10) || 0;
-    		TAS.notice("Current Pathfinder sheet data version:" + currVer + ", Sheet code version:" + version);
+        getAttrs(["PFSheet_Version", "PFSheet_forcesync", "recalc1"], function (v) {
+            var setter = {}, currVer = 0, setAny = 0, recalc = false;
+            currVer = parseFloat(v["PFSheet_Version"], 10) || 0;
+            TAS.notice("Current Pathfinder sheet data version:" + currVer + ", Sheet code version:" + version);
 
-    		if (currVer !== version) {
-    			recalc = true;
-    			setter["PFSheet_Version"] = version;
-    			setAny = 1;
-    		}
-    		if (v["recalc1"] && v["recalc1"] == "1") {
-    			currVer = -1;
-    			recalc = true;
-    			setter["recalc1"] = 0;
-    			setAny = 1;
-    		}
-    		if (v["PFSheet_forcesync"] && v["PFSheet_forcesync"] != "0") {
-    			currVer = -1;
-    			recalc = true;
-    			setter["PFSheet_forcesync"] = 0;
-    			setAny = 1;
-    		}
-    		if (setAny) {
-    			setAttrs(setter);
-    		}
-    		if (recalc) {
-    			recalculateSheet(currVer);
-    		}
-    	});
-	}
+            if (currVer !== version) {
+                recalc = true;
+                setter["PFSheet_Version"] = version;
+                setAny = 1;
+            }
+            if (v["recalc1"] && v["recalc1"] == "1") {
+                currVer = -1;
+                recalc = true;
+                setter["recalc1"] = 0;
+                setAny = 1;
+            }
+            if (v["PFSheet_forcesync"] && v["PFSheet_forcesync"] != "0") {
+                currVer = -1;
+                recalc = true;
+                setter["PFSheet_forcesync"] = 0;
+                setAny = 1;
+            }
+            if (setAny) {
+                setAttrs(setter);
+            }
+            if (recalc) {
+                recalculateSheet(currVer);
+            }
+        });
+    }
 
-	;
+    ;
 
 
-	return {
-		lists: {
-			repeatingSections: repeatingSections,
-			repeatingMaxUseSections: repeatingMaxUseSections,
-			abilities: abilities,
-			abilityEvents: abilityEvents,
-			abilityMods: abilityMods,
-			conditionEvents: conditionEvents,
-			buffColumns: buffColumns,
-			dropdowns: dropdowns,
-			defenseDropdowns: defenseDropdowns,
-			buffEvents:buffEvents,
-			buffEventsNoParam:buffEventsNoParam,			
-			saveTypes: saveTypes,
-			saveEvents: saveEvents,
-			classColumns: classColumns,
-			classRows: classRows,
-			allCoreSkills: allCoreSkills,
-			backgroundSkills: backgroundSkills,
-			consolidatedSkills: consolidatedSkills,
-			sizeSkills: sizeSkills,
-			skillEvents: skillEvents,
-			spellClassIndexes: spellClassIndexes,
-			spellClassEvents: spellClassEvents,
-			spellLevels: spellLevels,
-			spellLevelEvents: spellLevelEvents,
-			spellClassLevelsEvents: spellClassLevelsEvents,
+    return {
+        lists: {
+            repeatingSections: repeatingSections,
+            repeatingMaxUseSections: repeatingMaxUseSections,
+            abilities: abilities,
+            abilityEvents: abilityEvents,
+            abilityMods: abilityMods,
+            conditionEvents: conditionEvents,
+            buffColumns: buffColumns,
+            dropdowns: dropdowns,
+            defenseDropdowns: defenseDropdowns,
+            buffEvents:buffEvents,
+            buffEventsNoParam:buffEventsNoParam,            
+            saveTypes: saveTypes,
+            saveEvents: saveEvents,
+            classColumns: classColumns,
+            classRows: classRows,
+            allCoreSkills: allCoreSkills,
+            backgroundSkills: backgroundSkills,
+            consolidatedSkills: consolidatedSkills,
+            sizeSkills: sizeSkills,
+            skillEvents: skillEvents,
+            spellClassIndexes: spellClassIndexes,
+            spellClassEvents: spellClassEvents,
+            spellLevels: spellLevels,
+            spellLevelEvents: spellLevelEvents,
+            spellClassLevelsEvents: spellClassLevelsEvents,
             wornEquipmentRows: wornEquipmentRows,
             wornEquipmentColumns: wornEquipmentColumns,
             defenseArmorShieldRows: defenseArmorShieldRows,
             defenseArmorShieldColumns: defenseArmorShieldColumns
-		},
-		util: {
-			findAbilityInString: findAbilityInString,
-			findMultiplier: findMultiplier,
-			updateRowTotal: updateRowTotal,
-			handleDropdown: handleDropdown,
-			isBadRowId: isBadRowId
-		},
-		recalc: {
-			recalculateSkills: recalculateSkills
-		},
-		version: version,
-		updateSize: updateSize,
-		updateSizeFromText: updateSizeFromText,
-		updateAbility: updateAbility,
-		updateModifiedSpeed: updateModifiedSpeed,
-		updateGrapple: updateGrapple,
-		updatePin: updatePin,
-		updateBuffTotals: updateBuffTotals,
-		updateInit: updateInit,
-		updateHP: updateHP,
-		updateTempHP: updateTempHP,
-		updateClassInformation: updateClassInformation,
-		updateMythicPathInformation: updateMythicPathInformation,
-		updateTierMythicPower: updateTierMythicPower,
+        },
+        util: {
+            findAbilityInString: findAbilityInString,
+            findMultiplier: findMultiplier,
+            updateRowTotal: updateRowTotal,
+            handleDropdown: handleDropdown,
+            isBadRowId: isBadRowId
+        },
+        recalc: {
+            recalculateSkills: recalculateSkills
+        },
+        version: version,
+        updateSize: updateSize,
+        updateSizeFromText: updateSizeFromText,
+        updateAbility: updateAbility,
+        updateModifiedSpeed: updateModifiedSpeed,
+        updateGrapple: updateGrapple,
+        updatePin: updatePin,
+        updateBuffTotals: updateBuffTotals,
+        updateInit: updateInit,
+        updateHP: updateHP,
+        updateTempHP: updateTempHP,
+        updateClassInformation: updateClassInformation,
+        updateMythicPathInformation: updateMythicPathInformation,
+        updateTierMythicPower: updateTierMythicPower,
         updatePsionicBonusPower: updatePsionicBonusPower,
-		updateDefenses: updateDefenses,
-		updateArmor: updateArmor,
-		updateAttackEffectTotals: updateAttackEffectTotals,
-		updateDMGEffectTotals: updateDMGEffectTotals,
-		updateConditionsSavePenalty: updateConditionsSavePenalty,
-		updateSave: updateSave,
-		updateConditionDefensePenalty: updateConditionDefensePenalty,
-		handleDefenseDropdown: handleDefenseDropdown,
-		updateAttack: updateAttack,
-		updateDamage: updateDamage,
-		updateDamageNote: updateDamageNote,
-		updateConditionAttackPenalty: updateConditionAttackPenalty,
-		updateConditionAttackNote: updateConditionAttackNote,
-		handleRepeatingDamageDropdown: handleRepeatingDamageDropdown,
-		handleRepeatingAttackDropdown: handleRepeatingAttackDropdown,
-		updateRepeatingWeaponAttack: updateRepeatingWeaponAttack,
-		updateRepeatingWeaponDamage: updateRepeatingWeaponDamage,
-		updateRepeatingWeaponAttacks: updateRepeatingWeaponAttacks,
-		updateRepeatingWeaponDamages: updateRepeatingWeaponDamages,
-		updateConditionCheckPenalty: updateConditionCheckPenalty,
-		updateConditionAbilityPenalty: updateConditionAbilityPenalty,
-		updateMaxSkills: updateMaxSkills,
-		updateSkill: updateSkill,
-		verifyHasSkill: verifyHasSkill,
-		updateNPCHP: updateNPCHP,
-		updateWornEquipment: updateWornEquipment,
-		updateRepeatingItems:updateRepeatingItems,
-		updateCarriedCurrency: updateCarriedCurrency,
-		updateCarriedTotal: updateCarriedTotal,
-		updateCurrentLoad: updateCurrentLoad,
-		updateLoadsAndLift: updateLoadsAndLift,
-		handleSpellClassDropdown: handleSpellClassDropdown,
-		updateSpellClassRange: updateSpellClassRange,
-		updateConcentration: updateConcentration,
-		updateCasterLevel: updateCasterLevel,
-		ifSpellClassExists: ifSpellClassExists,
-		updateSpellPenetration: updateSpellPenetration,
-		updateMaxSpellsPerDay: updateMaxSpellsPerDay,
-		updateSpellClassLevel: updateSpellClassLevel,
-		updateSaveDCs: updateSaveDCs,
-		updateBonusSpells: updateBonusSpells,
-		handleConcentrationAbilityDropdown: handleConcentrationAbilityDropdown,
-		updateCastingPenaltyNote: updateCastingPenaltyNote,
-		updateSpell: updateSpell,
-		updateSpellRange: updateSpellRange,
-		updateSpells: updateSpells,
-		updateSpellsAll: updateSpellsAll,
-		checkIsNewRow: checkIsNewRow,
-		checkForUpdate: checkForUpdate
-	};
+        updateDefenses: updateDefenses,
+        updateArmor: updateArmor,
+        updateAttackEffectTotals: updateAttackEffectTotals,
+        updateDMGEffectTotals: updateDMGEffectTotals,
+        updateConditionsSavePenalty: updateConditionsSavePenalty,
+        updateSave: updateSave,
+        updateConditionDefensePenalty: updateConditionDefensePenalty,
+        handleDefenseDropdown: handleDefenseDropdown,
+        updateAttack: updateAttack,
+        updateDamage: updateDamage,
+        updateDamageNote: updateDamageNote,
+        updateConditionAttackPenalty: updateConditionAttackPenalty,
+        updateConditionAttackNote: updateConditionAttackNote,
+        handleRepeatingDamageDropdown: handleRepeatingDamageDropdown,
+        handleRepeatingAttackDropdown: handleRepeatingAttackDropdown,
+        updateRepeatingWeaponAttack: updateRepeatingWeaponAttack,
+        updateRepeatingWeaponDamage: updateRepeatingWeaponDamage,
+        updateRepeatingWeaponAttacks: updateRepeatingWeaponAttacks,
+        updateRepeatingWeaponDamages: updateRepeatingWeaponDamages,
+        updateConditionCheckPenalty: updateConditionCheckPenalty,
+        updateConditionAbilityPenalty: updateConditionAbilityPenalty,
+        updateMaxSkills: updateMaxSkills,
+        updateSkill: updateSkill,
+        verifyHasSkill: verifyHasSkill,
+        updateNPCHP: updateNPCHP,
+        updateWornEquipment: updateWornEquipment,
+        updateRepeatingItems:updateRepeatingItems,
+        updateCarriedCurrency: updateCarriedCurrency,
+        updateCarriedTotal: updateCarriedTotal,
+        updateCurrentLoad: updateCurrentLoad,
+        updateLoadsAndLift: updateLoadsAndLift,
+        handleSpellClassDropdown: handleSpellClassDropdown,
+        updateSpellClassRange: updateSpellClassRange,
+        updateConcentration: updateConcentration,
+        updateCasterLevel: updateCasterLevel,
+        ifSpellClassExists: ifSpellClassExists,
+        updateSpellPenetration: updateSpellPenetration,
+        updateMaxSpellsPerDay: updateMaxSpellsPerDay,
+        updateSpellClassLevel: updateSpellClassLevel,
+        updateSaveDCs: updateSaveDCs,
+        updateBonusSpells: updateBonusSpells,
+        handleConcentrationAbilityDropdown: handleConcentrationAbilityDropdown,
+        updateCastingPenaltyNote: updateCastingPenaltyNote,
+        updateSpell: updateSpell,
+        updateSpellRange: updateSpellRange,
+        updateSpells: updateSpells,
+        updateSpellsAll: updateSpellsAll,
+        checkIsNewRow: checkIsNewRow,
+        checkForUpdate: checkForUpdate
+    };
 }());
 
 
 //ABILITY SCORES
 _.each(PFSheet.lists.abilities, function (ability) {
-	on((PFSheet.lists.abilityEvents.replace(/REPLACE/g, ability)),
-		TAS.callback(function eventUpdateAbility(eventInfo) {
-			TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-			PFSheet.updateAbility(ability, eventInfo);
-		})
-	);
+    on((PFSheet.lists.abilityEvents.replace(/REPLACE/g, ability)),
+        TAS.callback(function eventUpdateAbility(eventInfo) {
+            TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+            PFSheet.updateAbility(ability, eventInfo);
+        })
+    );
 });
 
 
 //CONDITIONS
 _.each(PFSheet.lists.conditionEvents, function (functions, eventToWatch) {
-	_.each(functions, function (methodToCall) {
-		on(eventToWatch,
-			TAS.callback(function eventConditionEvents(eventInfo) {
-				TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-				methodToCall(eventInfo);
-			})
-		);
-	});
+    _.each(functions, function (methodToCall) {
+        on(eventToWatch,
+            TAS.callback(function eventConditionEvents(eventInfo) {
+                TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+                methodToCall(eventInfo);
+            })
+        );
+    });
 });
 on("change:Perception-cond",
-	TAS.callback(function eventUpdateSkillPerceptionCond(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.updateSkill("Perception", eventInfo);
-		PFSheet.updateSkill("CS-Perception", eventInfo);
-	})
+    TAS.callback(function eventUpdateSkillPerceptionCond(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.updateSkill("Perception", eventInfo);
+        PFSheet.updateSkill("CS-Perception", eventInfo);
+    })
 );
 on("change:acp-attack-mod",
-	TAS.callback(function eventUpdateConditionAttackPenalty(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.updateConditionAttackPenalty();
-	})
+    TAS.callback(function eventUpdateConditionAttackPenalty(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.updateConditionAttackPenalty();
+    })
 );
 
 //BUFFS
 _.each(PFSheet.lists.buffColumns, function (col) {
-	//Evaluate macro text upon change
-	var eventToWatch = "change:repeating_buff:buff-" + col + "_macro-text";
-	on(eventToWatch,
-	TAS.callback(function eventBuffMacroText(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		SWUtils.evaluateAndSetNumber("repeating_buff_buff-" + col + "_macro-text", "repeating_buf_buff-" + col);
-	})
-	);
+    //Evaluate macro text upon change
+    var eventToWatch = "change:repeating_buff:buff-" + col + "_macro-text";
+    on(eventToWatch,
+    TAS.callback(function eventBuffMacroText(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        SWUtils.evaluateAndSetNumber("repeating_buff_buff-" + col + "_macro-text", "repeating_buf_buff-" + col);
+    })
+    );
 
-	//Update total for a buff upon Mod change
-	eventToWatch = "change:repeating_buff:buff-" + col + " change:repeating_buff:buff-" + col + "-show";
-	on(eventToWatch,
-		TAS.callback(function eventBuffMod(eventInfo) {
-			TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-			PFSheet.updateBuffTotals(col);
-		})
-	);
+    //Update total for a buff upon Mod change
+    eventToWatch = "change:repeating_buff:buff-" + col + " change:repeating_buff:buff-" + col + "-show";
+    on(eventToWatch,
+        TAS.callback(function eventBuffMod(eventInfo) {
+            TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+            PFSheet.updateBuffTotals(col);
+        })
+    );
 });
 
 on("change:repeating_buff:buff-enable_toggle remove:repeating_buff",
-	TAS.callback(function eventUpdateBuffToggle(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		_.each(PFSheet.lists.buffColumns, function (col) {
-			PFSheet.updateBuffTotals(col);
-		});
-	})
+    TAS.callback(function eventUpdateBuffToggle(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        _.each(PFSheet.lists.buffColumns, function (col) {
+            PFSheet.updateBuffTotals(col);
+        });
+    })
 );
 
 //generic easy buff total updates
 _.each(PFSheet.lists.buffEvents,function(functions,col){
-	var eventToWatch="change:buff_"+col+"-total";
-	_.each(functions,function(methodToCall){
-		on(eventToWatch,
-			TAS.callback(function eventBuffTotal(eventInfo){
-				TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-				methodToCall(col,eventInfo);
-			})
-		);
-	});
+    var eventToWatch="change:buff_"+col+"-total";
+    _.each(functions,function(methodToCall){
+        on(eventToWatch,
+            TAS.callback(function eventBuffTotal(eventInfo){
+                TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+                methodToCall(col,eventInfo);
+            })
+        );
+    });
 });
 _.each(PFSheet.lists.buffEventsNoParam,function(functions,col){
-	var eventToWatch="change:buff_"+col+"-total";
-	_.each(functions,function(methodToCall){
-		on(eventToWatch,
-			TAS.callback(function eventBuffTotal(eventInfo){
-				TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-				methodToCall(eventInfo);
-			})
-		);
-	});
+    var eventToWatch="change:buff_"+col+"-total";
+    _.each(functions,function(methodToCall){
+        on(eventToWatch,
+            TAS.callback(function eventBuffTotal(eventInfo){
+                TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+                methodToCall(eventInfo);
+            })
+        );
+    });
 });
 
 
 //SKILLS
 on("change:total-skill change:total-fcskill change:int-mod change:level change:max-skill-ranks-mod change:Max-Skill-Ranks-Misc2 change:unchained_skills-show change:BG-Skill-Use",
-	TAS.callback(function eventUpdateMaxSkills(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.updateMaxSkills(eventInfo);
-	})
+    TAS.callback(function eventUpdateMaxSkills(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.updateMaxSkills(eventInfo);
+    })
 );
 on("change:max-skill-ranks-misc",
-	TAS.callback(function eventMaxSkillRanksMisc(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		SWUtils.evaluateAndSetNumber("Max-Skill-Ranks-Misc", "Max-Skill-Ranks-mod");
-	})
+    TAS.callback(function eventMaxSkillRanksMisc(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        SWUtils.evaluateAndSetNumber("Max-Skill-Ranks-Misc", "Max-Skill-Ranks-mod");
+    })
 );
 //each skill has a dropdown handler and a skill update handler
 //normal skills
@@ -16784,9 +16808,9 @@ _.each(PFSheet.lists.allCoreSkills, function (skill) {
 		TAS.callback(function eventNormalSkillAbility(eventInfo) {
 			TAS.debug("caught " + eventInfo.sourceAttribute + " event");
 			PFSheet.verifyHasSkill(skill, function (hasSkill) {
-				if (hasSkill) {
-			PFSheet.util.handleDropdown(skill + "-ability", skill + "-ability-mod");
-				}
+			 if (hasSkill) {
+				PFSheet.util.handleDropdown(skill + "-ability", skill + "-ability-mod");
+			 }
 			});
 		})
 	);
@@ -16803,9 +16827,9 @@ _.each(PFSheet.lists.consolidatedSkills, function (skill) {
 		TAS.callback(function eventConsolidatedSkillAbility(eventInfo) {
 			TAS.debug("caught " + eventInfo.sourceAttribute + " event");
 			PFSheet.verifyHasSkill(skill, function (hasSkill) {
-				if (hasSkill) {
-			PFSheet.util.handleDropdown(skill + "-ability", skill + "-ability-mod");
-				}
+			 if (hasSkill) {
+				 PFSheet.util.handleDropdown(skill + "-ability", skill + "-ability-mod");
+			 }
 			});
 		})
 	);
@@ -16822,543 +16846,543 @@ _.each(PFSheet.lists.backgroundSkills, function (skill) {
 		TAS.callback(function eventBackgroundSkillAbility(eventInfo) {
 			TAS.debug("caught " + eventInfo.sourceAttribute + " event");
 			PFSheet.verifyHasSkill(skill, function (hasSkill) {
-				if (hasSkill) {
-			PFSheet.util.handleDropdown(skill + "-ability", skill + "-ability-mod");
-				}
+			 if (hasSkill) {
+				 PFSheet.util.handleDropdown(skill + "-ability", skill + "-ability-mod");
+			 }
 			});
 		})
 	);
 });
 //skills affected by size
 _.each(PFSheet.lists.sizeSkills, function (mult, skill) {
-	if (mult === 1) {
-		on("change:size_skill",
-			TAS.callback(function eventUpdateSizeSkill(eventInfo) {
-				TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-				PFSheet.updateSkill(skill, eventInfo);
-			})
-		);
-	} else if (mult === 2) {
-		on("change:size_skill_double",
-			TAS.callback(function eventUpdateSizeSkillDouble(eventInfo) {
-				TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-				PFSheet.updateSkill(skill, eventInfo);
-			})
-		);
-	}
+    if (mult === 1) {
+        on("change:size_skill",
+            TAS.callback(function eventUpdateSizeSkill(eventInfo) {
+                TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+                PFSheet.updateSkill(skill, eventInfo);
+            })
+        );
+    } else if (mult === 2) {
+        on("change:size_skill_double",
+            TAS.callback(function eventUpdateSizeSkillDouble(eventInfo) {
+                TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+                PFSheet.updateSkill(skill, eventInfo);
+            })
+        );
+    }
 });
 
 
 //init 
 on("change:init-ability-mod change:init-trait change:init-misc",
-	TAS.callback(function eventUpdateInit(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.updateInit();
-	})
+    TAS.callback(function eventUpdateInit(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.updateInit();
+    })
 );
 
 //speed
-on("change:current-load change:speed-base change:load-heavy change:carried-total change:race change:armor-equipped change:armor2-equipped change:armor3-equipped change:armor-type change:armor2-type change:armor3-type",
-	TAS.callback(function eventUpdateModifiedSpeed(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.updateModifiedSpeed();
-	})
+on("change:current-load change:speed-base change:load-heavy change:carried-total change:race change:armor-equipped change:armor2-equipped change:armor3-equipped change:armor-type change:armor2-type change:armor3-type change:speed-source change:run-mult",
+    TAS.callback(function eventUpdateModifiedSpeed(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.updateModifiedSpeed();
+    })
 );
 
 //hp
 on("change:hp-ability-mod change:level change:total-hp change:total-mythic-hp change:hp-formula-mod change:HP-misc change:mythic-adventures-show",
-	TAS.callback(function eventUpdateHP(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.updateHP();
-	})
+    TAS.callback(function eventUpdateHP(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.updateHP();
+    })
 );
 on("change:hp-temp-misc",
-	TAS.callback(function eventUpdateTempHP(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.updateTempHP();
-	})
+    TAS.callback(function eventUpdateTempHP(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.updateTempHP();
+    })
 );
 on("change:hp-formula-macro-text",
-	TAS.callback(function eventHPFormulaMacroText(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		SWUtils.evaluateAndSetNumber("HP-formula-macro-text", "HP-formula-mod");
-	})
+    TAS.callback(function eventHPFormulaMacroText(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        SWUtils.evaluateAndSetNumber("HP-formula-macro-text", "HP-formula-mod");
+    })
 );
 
 //CLASSES
 _.each(PFSheet.lists.classColumns, function (col) {
-	var eventsToWatch = _.map(PFSheet.lists.classRows, function (row) {
-		return "change:class-" + row + "-" + col;
-	}).join(" ");
-	on(eventsToWatch,
-		TAS.callback(function eventUpdateClassInformation(eventInfo) {
-			TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-			PFSheet.updateClassInformation(col, eventInfo);
-		})
-	);
-	if (col === "level") {
-		on(eventsToWatch,
-			TAS.callback(function eventUpdateClassInformationLevel(eventInfo) {
-				TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-				PFSheet.updateClassInformation("skill", eventInfo);
-			})
-		);
-	}
+    var eventsToWatch = _.map(PFSheet.lists.classRows, function (row) {
+        return "change:class-" + row + "-" + col;
+    }).join(" ");
+    on(eventsToWatch,
+        TAS.callback(function eventUpdateClassInformation(eventInfo) {
+            TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+            PFSheet.updateClassInformation(col, eventInfo);
+        })
+    );
+    if (col === "level") {
+        on(eventsToWatch,
+            TAS.callback(function eventUpdateClassInformationLevel(eventInfo) {
+                TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+                PFSheet.updateClassInformation("skill", eventInfo);
+            })
+        );
+    }
 });
 //rows class level updates spell class level 
 _.each(PFSheet.lists.classRows, function (row) {
-	on("change:class-" + row + "-level",
-		TAS.callback(function eventUpdateSpellClassLevel(eventInfo) {
-			TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-			PFSheet.updateSpellClassLevel(parseInt(row, 10), eventInfo);
-		})
-	);
+    on("change:class-" + row + "-level",
+        TAS.callback(function eventUpdateSpellClassLevel(eventInfo) {
+            TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+            PFSheet.updateSpellClassLevel(parseInt(row, 10), eventInfo);
+        })
+    );
 });
 
-//GENERIC DROPDOWNS	
+//GENERIC DROPDOWNS 
 _.each(PFSheet.lists.dropdowns, function (write, read) {
-	on("change:" + read,
-		TAS.callback(function eventGenericDropdowns(eventInfo) {
-			TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-			PFSheet.util.handleDropdown(read, write);
-		})
-	);
+    on("change:" + read,
+        TAS.callback(function eventGenericDropdowns(eventInfo) {
+            TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+            PFSheet.util.handleDropdown(read, write);
+        })
+    );
 });
 //DEFENSE DROPDOWNS 
 _.each(PFSheet.lists.defenseDropdowns, function (write, read) {
-	on("change:" + read,
-		TAS.callback(function eventHandleDefenseDropdown(eventInfo) {
-			TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-			PFSheet.handleDefenseDropdown(read);
-		})
-	);
+    on("change:" + read,
+        TAS.callback(function eventHandleDefenseDropdown(eventInfo) {
+            TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+            PFSheet.handleDefenseDropdown(read);
+        })
+    );
 });
 //Spell Resistance
 on("change:SR-macro-text",
-	TAS.callback(function eventSRMacroText(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		SWUtils.evaluateAndSetNumber("SR-macro-text", "SR");
-	})
+    TAS.callback(function eventSRMacroText(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        SWUtils.evaluateAndSetNumber("SR-macro-text", "SR");
+    })
 );
 
 //mythic paths
 on("change:mythic-tier change:mythic-hp",
-	TAS.callback(function eventUpdateMythicPathInformation(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.updateMythicPathInformation();
-	})
+    TAS.callback(function eventUpdateMythicPathInformation(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.updateMythicPathInformation();
+    })
 );
 
 //mythic power
 on("change:mythic-tier",
-	TAS.callback(function eventUpdateTierMythicPower(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.updateTierMythicPower();
-	})
+    TAS.callback(function eventUpdateTierMythicPower(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.updateTierMythicPower();
+    })
 );
 on("change:misc-mythic-power change:tier-mythic-power",
-	TAS.callback(function eventUpdateMythicPower(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.util.updateRowTotal(["mythic-power_max", "tier-mythic-power", "misc-mythic-power"]);
-	})
+    TAS.callback(function eventUpdateMythicPower(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.util.updateRowTotal(["mythic-power_max", "tier-mythic-power", "misc-mythic-power"]);
+    })
 );
 
 //psionics
 on("change:psionic-level change:psionic-level-misc",
-	TAS.callback(function eventUpdatePsionicLevel(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.util.updateRowTotal(["psionic-level-total", "psionic-level", "psionic-level-misc"]);
-	})
+    TAS.callback(function eventUpdatePsionicLevel(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.util.updateRowTotal(["psionic-level-total", "psionic-level", "psionic-level-misc"]);
+    })
 );
 on("change:class-psionic-power change:ability-psionic-power change:misc-psionic-power",
-	TAS.callback(function eventUpdatePsionicPower(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.util.updateRowTotal(["psionic-power_max", "class-psionic-power", "ability-psionic-power", "misc-psionic-power"]);
-	})
+    TAS.callback(function eventUpdatePsionicPower(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.util.updateRowTotal(["psionic-power_max", "class-psionic-power", "ability-psionic-power", "misc-psionic-power"]);
+    })
 );
 on("change:selected-ability-psionic-power change:psionic-level-total",
-	TAS.callback(function eventUpdatePsionicBonusPower(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+    TAS.callback(function eventUpdatePsionicBonusPower(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
         PFSheet.updatePsionicBonusPower();
-	})
+    })
 );
 
 //defenses
 on("change:ac-ability-mod change:ff-dex change:ac-penalty change:cmd-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:bab change:max-dex",
-	TAS.callback(function eventUpdateDefenses(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.updateDefenses(eventInfo);
-	})
+    TAS.callback(function eventUpdateDefenses(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.updateDefenses(eventInfo);
+    })
 );
 
 on("change:max-dex-source change:acp-source change:current-load",
-	TAS.callback(function eventUpdateArmor(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.updateArmor(eventInfo.sourceAttribute);
-	})
+    TAS.callback(function eventUpdateArmor(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.updateArmor(eventInfo.sourceAttribute);
+    })
 );
 _.each(PFSheet.lists.defenseArmorShieldRows, function (row) {
     _.each(PFSheet.lists.defenseArmorShieldColumns, function (column) {
-	    var eventToWatch = "change:" + row + "-" + column;
-	    on(eventToWatch,
-		    TAS.callback(function eventUpdateDefenseArmorShield(eventInfo) {
-			    TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-			    PFSheet.updateArmor(eventInfo.sourceAttribute);
-		    })
-	    );
+        var eventToWatch = "change:" + row + "-" + column;
+        on(eventToWatch,
+            TAS.callback(function eventUpdateDefenseArmorShield(eventInfo) {
+                TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+                PFSheet.updateArmor(eventInfo.sourceAttribute);
+            })
+        );
     });
 });
 
 //saves
 _.each(PFSheet.lists.saveTypes, function (save) {
-	var eventToWatch = PFSheet.lists.saveEvents.replace(/REPLACE/g, save);
-	on(eventToWatch,
-		TAS.callback(function eventUpdateSave(eventInfo) {
-			TAS.debug("caught " + eventInfo.sourceAttribute + " event for " + save);
-			PFSheet.updateSave(save, eventInfo);
-		})
-	);
+    var eventToWatch = PFSheet.lists.saveEvents.replace(/REPLACE/g, save);
+    on(eventToWatch,
+        TAS.callback(function eventUpdateSave(eventInfo) {
+            TAS.debug("caught " + eventInfo.sourceAttribute + " event for " + save);
+            PFSheet.updateSave(save, eventInfo);
+        })
+    );
 });
 
 //attacks
 on("change:bab change:size change:melee-ability-mod change:attk-melee-misc change:attk-penalty",
-	TAS.callback(function eventUpdateMeleeAttack(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.updateAttack("Melee");
-	})
+    TAS.callback(function eventUpdateMeleeAttack(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.updateAttack("Melee");
+    })
 );
 on("change:bab change:size change:ranged-ability-mod change:attk-ranged-misc change:attk-penalty",
-	TAS.callback(function eventUpdateRangedAttack(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.updateAttack("Ranged");
-	})
+    TAS.callback(function eventUpdateRangedAttack(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.updateAttack("Ranged");
+    })
 );
 on("change:bab change:CMD-size change:cmb-ability-mod change:attk-cmb-misc change:attk-penalty",
-	TAS.callback(function eventUpdateCmbAttack(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.updateAttack("CMB");
-	})
+    TAS.callback(function eventUpdateCmbAttack(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.updateAttack("CMB");
+    })
 );
 
 //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",
-	TAS.callback(function eventUpdateAttackEffectTotals(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.updateAttackEffectTotals();
-	})
+    TAS.callback(function eventUpdateAttackEffectTotals(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        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",
-	TAS.callback(function eventUpdateDmgEffectTotals(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.updateDMGEffectTotals();
-	})
+    TAS.callback(function eventUpdateDmgEffectTotals(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.updateDMGEffectTotals();
+    })
 );
 
 //repeating weapons
 on("change:attk-effect-total",
-	TAS.callback(function eventUpdateRepeatingWeaponAttackTotal(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.updateRepeatingWeaponAttacks(eventInfo);
-	})
+    TAS.callback(function eventUpdateRepeatingWeaponAttackTotal(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.updateRepeatingWeaponAttacks(eventInfo);
+    })
 );
 on("change:dmg-effect-total change:dmg-mod",
-	TAS.callback(function eventUpdateRepeatingWeaponDamageTotal(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.updateRepeatingWeaponDamages();
-	})
+    TAS.callback(function eventUpdateRepeatingWeaponDamageTotal(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.updateRepeatingWeaponDamages();
+    })
 );
 
 on("change:repeating_weapon:attack-type-mod change:repeating_weapon:masterwork change:repeating_weapon:proficiency change:repeating_weapon:attack-mod",
-	TAS.callback(function eventUpdateRepeatingWeaponAttack(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.updateRepeatingWeaponAttack(null, eventInfo);
-	})
+    TAS.callback(function eventUpdateRepeatingWeaponAttack(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.updateRepeatingWeaponAttack(null, eventInfo);
+    })
 );
 on("change:repeating_weapon:damage-ability-mod change:repeating_weapon:damage-mod change:repeating_weapon:damage-ability-max",
-	TAS.callback(function eventUpdateRepeatingWeaponDamage(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.updateRepeatingWeaponDamage();
-	})
+    TAS.callback(function eventUpdateRepeatingWeaponDamage(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.updateRepeatingWeaponDamage();
+    })
 );
 
 on("change:repeating_weapon:attack-type",
-	TAS.callback(function eventHandleRepeatingAttackDropdown(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.handleRepeatingAttackDropdown(null, eventInfo);
-	})
+    TAS.callback(function eventHandleRepeatingAttackDropdown(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.handleRepeatingAttackDropdown(null, eventInfo);
+    })
 );
 on("change:repeating_weapon:damage-ability",
-	TAS.callback(function eventHandleRepeatingDamageDropdown(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.handleRepeatingDamageDropdown();
-	})
+    TAS.callback(function eventHandleRepeatingDamageDropdown(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.handleRepeatingDamageDropdown();
+    })
 );
 on("change:repeating_weapon:damage",
-	TAS.callback(function eventRepeatingWeaponDamage(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		SWUtils.evaluateAndSetNumber("repeating_weapon_damage", "repeating_weapon_damage-mod");
-	})
+    TAS.callback(function eventRepeatingWeaponDamage(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        SWUtils.evaluateAndSetNumber("repeating_weapon_damage", "repeating_weapon_damage-mod");
+    })
 );
 on("change:repeating_weapon:attack",
-	TAS.callback(function eventRepeatingWeaponAttack(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		SWUtils.evaluateAndSetNumber("repeating_weapon_attack", "repeating_weapon_attack-mod");
-	})
+    TAS.callback(function eventRepeatingWeaponAttack(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        SWUtils.evaluateAndSetNumber("repeating_weapon_attack", "repeating_weapon_attack-mod");
+    })
 );
 
 on("change:repeating_weapon:enhance",
-	TAS.callback(function eventUpdateRepeatingWeaponAttackAndDamage(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.updateRepeatingWeaponAttack(null, eventInfo);
-		PFSheet.updateRepeatingWeaponDamage();
-	})
+    TAS.callback(function eventUpdateRepeatingWeaponAttackAndDamage(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.updateRepeatingWeaponAttack(null, eventInfo);
+        PFSheet.updateRepeatingWeaponDamage();
+    })
 );
 
 //size
 on("change:size",
-	TAS.callback(function eventUpdateSize(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.updateSize();
-	})
+    TAS.callback(function eventUpdateSize(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.updateSize();
+    })
 );
 //compendium copy will fire this one
 on("change:size_display",
-	TAS.callback(function eventUpdateSizeText(eventInfo) {
-		TAS.debug("caught size_display event");
-		PFSheet.updateSizeFromText();
-	})
+    TAS.callback(function eventUpdateSizeText(eventInfo) {
+        TAS.debug("caught size_display event");
+        PFSheet.updateSizeFromText();
+    })
 );
 
 //GENERIC REPEATING LISTS USED MAX
 _.each(PFSheet.lists.repeatingMaxUseSections, function (section) {
-	var eventToWatch = "change:repeating_" + section + ":max-calculation";
-	on(eventToWatch,
-		TAS.callback(function eventRepeatingMaxUseSections(eventInfo) {
-			TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-			SWUtils.evaluateAndSetNumber("repeating_" + section + "_max-calculation", "repeating_" + section + "_used_max");
-		})
-	);
+    var eventToWatch = "change:repeating_" + section + ":max-calculation";
+    on(eventToWatch,
+        TAS.callback(function eventRepeatingMaxUseSections(eventInfo) {
+            TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+            SWUtils.evaluateAndSetNumber("repeating_" + section + "_max-calculation", "repeating_" + section + "_used_max");
+        })
+    );
 });
 
 //sheet
 on("sheet:opened",
-	TAS.callback(function eventSheetOpened(eventInfo) {
-		//TAS.debug("caught " + eventInfo.sourceAttribute + " event"); // sourceAttribute is undefined in this event
-		PFSheet.checkForUpdate();
-	})
+    TAS.callback(function eventSheetOpened(eventInfo) {
+        //TAS.debug("caught " + eventInfo.sourceAttribute + " event"); // sourceAttribute is undefined in this event
+        PFSheet.checkForUpdate();
+    })
 );
 on("change:recalc1",
-	TAS.callback(function eventRecaluateSheet(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.checkForUpdate();
-	})
+    TAS.callback(function eventRecaluateSheet(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.checkForUpdate();
+    })
 );
 
 //npc sheet
 on("change:npc-hd change:npc-hd-num change:npc-hd2 change:npc-hd-num2 change:npc-hd-misc-mod",
-	TAS.callback(function eventUpdateNpcHp(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.updateNPCHP();
-	})
+    TAS.callback(function eventUpdateNpcHp(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.updateNPCHP();
+    })
 );
 on("change:npc-hd-misc",
-	TAS.callback(function eventNpcHdMisc(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		SWUtils.evaluateAndSetNumber("NPC-HD-misc", "NPC-HD-misc-mod");
-	})
+    TAS.callback(function eventNpcHdMisc(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        SWUtils.evaluateAndSetNumber("NPC-HD-misc", "NPC-HD-misc-mod");
+    })
 );
 
 //items
 _.each(PFSheet.lists.wornEquipmentRows, function (row) {
     _.each(PFSheet.lists.wornEquipmentColumns, function (column) {
-	    var eventToWatch = "change:worn-" + row + "-" + column;
-	    on(eventToWatch,
-		    TAS.callback(function eventUpdateWornEquipmentTotal(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-			    PFSheet.updateWornEquipment(column);
-	})
+        var eventToWatch = "change:worn-" + row + "-" + column;
+        on(eventToWatch,
+            TAS.callback(function eventUpdateWornEquipmentTotal(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+                PFSheet.updateWornEquipment(column);
+    })
 );
     });
 });
 on('change:repeating_item:weight change:repeating_item:qty change:repeating_item:qty_max change:repeating_item:location',
     TAS.callback(function eventUpdateItemTotalWeight(eventInfo) {
-    	TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		//this does a few more fields than weight
-		//	PFSheet.updateRepeatingItems();
-    	TAS.repeating('item')
-			.attrs('item_total_weight')
-			.fields('weight', 'qty', 'qty_max', 'location')
-			.reduce(function (m, r) {
-				if (r.I.qty > 0 && r.I.location == 0) {
-					if (r.I.qty_max == 0) {
-						m.weight += r.F.weight * r.I.qty;
-					} else {
-						m.weight += r.F.weight;
-					}
-				}
-				return m;
-			}, {
-				weight: 0
-			}, function (m, r, a) {
-				a.S['item_total_weight'] = m.weight;
-			})
-			.execute();
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        //this does a few more fields than weight
+        //  PFSheet.updateRepeatingItems();
+        TAS.repeating('item')
+            .attrs('item_total_weight')
+            .fields('weight', 'qty', 'qty_max', 'location')
+            .reduce(function (m, r) {
+                if (r.I.qty > 0 && r.I.location == 0) {
+                    if (r.I.qty_max == 0) {
+                        m.weight += r.F.weight * r.I.qty;
+                    } else {
+                        m.weight += r.F.weight;
+                    }
+                }
+                return m;
+            }, {
+                weight: 0
+            }, function (m, r, a) {
+                a.S['item_total_weight'] = m.weight;
+            })
+            .execute();
     })
 );
 on('change:repeating_item:hp change:repeating_item:hp_max',
-	TAS.callback(function eventUpdateItemTotalHp(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		TAS.repeating('item')
-			.attrs('item-total-hp', 'item-total-hp_max')
-			.fields('hp', 'hp_max')
-			.reduce(function (m, r) {
-				m.hp += r.I.hp;
-				m.hp_max += r.I.hp_max;
-				return m;
-			}, {
-				hp: 0,
-				hp_max: 0
-			}, function (m, r, a) {
-				a.S['item-total-hp'] = m.hp;
-				a.S['item-total-hp_max'] = m.hp_max;
-			})
-			.execute();
-	})
+    TAS.callback(function eventUpdateItemTotalHp(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        TAS.repeating('item')
+            .attrs('item-total-hp', 'item-total-hp_max')
+            .fields('hp', 'hp_max')
+            .reduce(function (m, r) {
+                m.hp += r.I.hp;
+                m.hp_max += r.I.hp_max;
+                return m;
+            }, {
+                hp: 0,
+                hp_max: 0
+            }, function (m, r, a) {
+                a.S['item-total-hp'] = m.hp;
+                a.S['item-total-hp_max'] = m.hp_max;
+            })
+            .execute();
+    })
 );
 on('change:repeating_item:value',
-	TAS.callback(function eventUpdateItemTotalValue(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+    TAS.callback(function eventUpdateItemTotalValue(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
 
-		TAS.repeating('item')
-			.attrs('item-total-value')
-			.fields('value')
-			.reduce(function (m, r) {
-				m.value += r.I.value;
-				return m;
-			}, {
-				value: 0
-			}, function (m, r, a) {
-				a.S['item-total-value'] = m.value;
-			})
-			.execute();
-	})
+        TAS.repeating('item')
+            .attrs('item-total-value')
+            .fields('value')
+            .reduce(function (m, r) {
+                m.value += r.I.value;
+                return m;
+            }, {
+                value: 0
+            }, function (m, r, a) {
+                a.S['item-total-value'] = m.value;
+            })
+            .execute();
+    })
 );
 on('remove:repeating_item',
-	TAS.callback(function eventRemoveItem(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.updateRepeatingItems();
-	})
+    TAS.callback(function eventRemoveItem(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.updateRepeatingItems();
+    })
 );
 on('change:CP change:SP change:GP change:PP',
     TAS.callback(function eventUpdateCarriedCurrency(eventInfo) {
-    	TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-    	PFSheet.updateCarriedCurrency();
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.updateCarriedCurrency();
     })
 );
 on('change:carried-currency change:item_total_weight change:worn-total-weight change:carried-misc',
     TAS.callback(function eventUpdateCarriedTotal(eventInfo) {
-    	TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-    	PFSheet.updateCarriedTotal();
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.updateCarriedTotal();
     })
 );
 on('change:load-light change:carried-total',
     TAS.callback(function eventUpdateCurrentLoad(eventInfo) {
-    	TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-    	PFSheet.updateCurrentLoad();
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.updateCurrentLoad();
     })
 );
 on("change:STR change:size change:legs change:load-str-bonus change:load-multiplier change:load-misc",
     TAS.callback(function eventUpdateLoadsAndLift(eventInfo) {
-    	TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-    	PFSheet.updateLoadsAndLift();
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.updateLoadsAndLift();
     })
 );
 
 //SPELLS
 //spellclass section (3 tabs at top of spell page)
 _.each(PFSheet.lists.spellClassIndexes, function (spellClassIdx) {
-	var numberIdx = parseInt(spellClassIdx, 10);
-	_.each(PFSheet.lists.spellClassEvents, function (functions, event) {
-		var eventToWatch = event.replace(/REPLACE/g, spellClassIdx);
-		_.each(functions, function (methodToCall) {
-			on(eventToWatch,
-				TAS.callback(function eventIfSpellClassExists(eventInfo) {
-					TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-					PFSheet.ifSpellClassExists(spellClassIdx, _.bind(methodToCall, {}, numberIdx, eventInfo));
-				})
-			);
-		});
-	});
+    var numberIdx = parseInt(spellClassIdx, 10);
+    _.each(PFSheet.lists.spellClassEvents, function (functions, event) {
+        var eventToWatch = event.replace(/REPLACE/g, spellClassIdx);
+        _.each(functions, function (methodToCall) {
+            on(eventToWatch,
+                TAS.callback(function eventIfSpellClassExists(eventInfo) {
+                    TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+                    PFSheet.ifSpellClassExists(spellClassIdx, _.bind(methodToCall, {}, numberIdx, eventInfo));
+                })
+            );
+        });
+    });
 });
 
 //all repeating spell updates
 _.each(PFSheet.lists.spellLevels, function (spellLevel) {
-	var section = "lvl-" + spellLevel + "spells";
-	_.each(PFSheet.lists.spellLevelEvents, function (functions, event) {
-		var eventToWatch = event.replace(/REPLACE/g, spellLevel);
-		_.each(functions, function (methodToCall) {
-			on(eventToWatch,
-				TAS.callback(function eventSpellLevelEvents(eventInfo) {
-					TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-					methodToCall(section, null, eventInfo);
-				})
-			);
-		});
-	});
+    var section = "lvl-" + spellLevel + "spells";
+    _.each(PFSheet.lists.spellLevelEvents, function (functions, event) {
+        var eventToWatch = event.replace(/REPLACE/g, spellLevel);
+        _.each(functions, function (methodToCall) {
+            on(eventToWatch,
+                TAS.callback(function eventSpellLevelEvents(eventInfo) {
+                    TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+                    methodToCall(section, null, eventInfo);
+                })
+            );
+        });
+    });
 });
 
 //spells per day
 _.each(PFSheet.lists.spellClassIndexes, function (spellClassIdx) {
-	var classNumber = parseInt(spellClassIdx, 10);
-	_.each(PFSheet.lists.spellLevels, function (spellLevel) {
-		var spellNumber = parseInt(spellLevel, 10)
-		, eventToWatch = PFSheet.lists.spellClassLevelsEvents.replace(/CLASSIDX/g, spellClassIdx).replace(/SPELLLEVEL/g, spellLevel);
-		on(eventToWatch,
-			TAS.callback(function eventSpellsPerDay(eventInfo) {
-				TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-				PFSheet.ifSpellClassExists(classNumber, _.bind(PFSheet.updateMaxSpellsPerDay, {}, classNumber, spellNumber));
-			})
-		);
-	});
+    var classNumber = parseInt(spellClassIdx, 10);
+    _.each(PFSheet.lists.spellLevels, function (spellLevel) {
+        var spellNumber = parseInt(spellLevel, 10)
+        , eventToWatch = PFSheet.lists.spellClassLevelsEvents.replace(/CLASSIDX/g, spellClassIdx).replace(/SPELLLEVEL/g, spellLevel);
+        on(eventToWatch,
+            TAS.callback(function eventSpellsPerDay(eventInfo) {
+                TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+                PFSheet.ifSpellClassExists(classNumber, _.bind(PFSheet.updateMaxSpellsPerDay, {}, classNumber, spellNumber));
+            })
+        );
+    });
 });
 
 //REPEATING SECTIONS set IDs
 _.each(PFSheet.lists.repeatingSections, function (section) {
-	var eventToWatch = "change:repeating_" + section + ":ids-show";
-	on(eventToWatch,
-		TAS.callback(function eventCheckIsNewRow(eventInfo) {
-			TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-			PFSheet.checkIsNewRow(section, eventInfo);
-		})
-	);
+    var eventToWatch = "change:repeating_" + section + ":ids-show";
+    on(eventToWatch,
+        TAS.callback(function eventCheckIsNewRow(eventInfo) {
+            TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+            PFSheet.checkIsNewRow(section, eventInfo);
+        })
+    );
 });
 
 //reset based on config changes
 on("change:wound_threshold-show",
-	TAS.callback(function eventResetConditionWounds(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		setAttrs({ "condition-Wounds": 0 });
-	})
+    TAS.callback(function eventResetConditionWounds(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        setAttrs({ "condition-Wounds": 0 });
+    })
 );
 
 on("change:unchained_skills-show change:BG-Skill-Use",
-	TAS.callback(function eventResetConditionWounds(eventInfo) {
-		TAS.debug("caught " + eventInfo.sourceAttribute + " event");
-		PFSheet.recalc.recalculateSkills();
-	})
+    TAS.callback(function eventResetUnchainedSkills(eventInfo) {
+        TAS.debug("caught " + eventInfo.sourceAttribute + " event");
+        PFSheet.recalc.recalculateSkills();
+    })
 );
 
 _.each(PFSheet.lists.repeatingSections, function (section) {
-	var eventToWatch="change:_reporder_repeating_"+section;
-	on(eventToWatch,
-		TAS.callback(function eventReorderSection(eventInfo) {
-			var field = "_reporder_repeating_"+section;
-			TAS.debug(eventInfo);
-			getAttrs([field],function(v){
-				TAS.debug(v);
-			});
-		})
-	);
+    var eventToWatch="change:_reporder_repeating_"+section;
+    on(eventToWatch,
+        TAS.callback(function eventReorderSection(eventInfo) {
+            var field = "_reporder_repeating_"+section;
+            TAS.debug(eventInfo);
+            getAttrs([field],function(v){
+                TAS.debug(v);
+            });
+        })
+    );
 });