diff --git a/Pathfinder-Neceros/pathfinder-neceros.html b/Pathfinder-Neceros/pathfinder-neceros.html
index 5ea495e616..0ceecbf82a 100644
--- a/Pathfinder-Neceros/pathfinder-neceros.html
+++ b/Pathfinder-Neceros/pathfinder-neceros.html
@@ -4,71 +4,71 @@
 	<span class="sheet-offscreen" data-i18n="Instru-a-3">Screenreader users should check expand all to ensure all content is visible to the reader. It is the second checkbox on this page.</span>
 	<span class="sheet-offscreen" data-i18n="Instru-a-2">Screenreader users please turn on reading of Title attributes. A lot of information is still in the titles.</span>
 	<span class="sheet-offscreen" data-i18n="Instru-a-1">Checkboxes with a label cause the section with same name (h2 or h3 header) to be revealed or hidden.</span>
-	<span class="sheet-selectable" style="font-size:.8rem;color:red;" data-i18n="announce-40" ><strong>TAKE OUR SURVEY</strong>: https://www.surveymonkey.com/r/BL797KV</span><br/>
-	<input type="checkbox" name="attr_attention71-show" value="1" class="sheet-showarrow sheet-ack-button" data-i18n-title="show-announcements" aria-label="Check to reveal Announcements section" data-i18n-aria-label="show-announcements" tabindex="0" />
+	<input type="checkbox" name="attr_attention72-show" value="1" class="sheet-showarrow sheet-ack-button" data-i18n-title="show-announcements" aria-label="Check to reveal Announcements section" data-i18n-aria-label="show-announcements" tabindex="0" />
 	<label class="sheet-showsect" data-i18n-title="show-announcements" data-i18n="announcements">Announcements</label>
 	<input style="float:right;" type="checkbox" name="attr_expandall" aria-label="Expand All" data-i18n-aria-label="expand-all" aria-describedby="Acts like a button. Expands all areas and then resets." value="1" tabindex="0" />
 	<label style="float:right;margin-right:.5em;margin-left:1em;" data-i18n="expand-all">Expand All</label>
 	<input type="checkbox" value="1" name="attr_is_undead" style="display:none;" role="presentation" />
 	<div role="contentinfo" aria-label="Announces changes to sheet" data-i18n-aria-label="announcements" class="sheet-announcements sheet-selectable">
 		<div class="sheet-footer" style="text-align:left; padding:5px; margin:5px;">
+			<ul>
+				<li><span data-i18n="announce-41"><strong>LASTPASS USERS NOTE:</strong> LastPass is still interfering with some Roll20 sheets. If you are experiencing degraded performance try disabling LastPass.</span></li>
+				<li><span data-i18n="announce-42">Fixes for .72: Buff check updates skills without hitting refresh. Fixes to attack and damage not appearing in rolls. Recalc will finish. Requires Training no longer removes skill submenus from skill menu.</span></li>
+				<li><span data-i18n="announce-43">Thank you for your survey feedback. New changes are coming to simply the sheet making it much easier to use.</span></li>
+			</ul>
 			<h2 style="font-weight:bold;"><span data-i18n="upcoming-changes">Upcoming Changes</span>:</h2>
 			<ol>
 				<li data-i18n="announce-37"><strong>INVENTORY PAGE CHANGING:</strong> see Beta link in footer. Armor set on inventory page. One list for equipment instead of 2.</li>
 				<li data-i18n="announce-32"><strong>NPC CHANGES COMING</strong> @{hp} will be used instead of @{npc-hp}.</li>
-				<li data-i18n="announce-30">GMs, ensure <strong>IS NPC</strong> is checked on all monster sheets. Starting with version 1.00 IS NPC will be a flag for the sheet to behave differently.</li>
-				<li data-i18n="announce-38">CREATURE PARSING in v1.00 see <em>beta link</em> in footer</li>
-			</ol>
-			<span data-i18n="announce-39">Fixes for .71: Craft and other "fill in skills" now update totals properly.</span>
-		</div>
-		<input type="checkbox" name="attr_attention0-show" value="1" checked class="sheet-showarrow sheet-ack-button" aria-label="Show Announcements" data-i18n-aria-label="show-announcements" />
-		<h2 class="sheet-showsect"><label data-i18n-title="show-announcements" data-i18n="announcements-old">Old Announcements</label></h2>
-		<div class="sheet-footer sheet-sect sheet-announcements" style="text-align:left; padding:5px; margin:5px;">
-			<ol>
-				<li data-i18n="announce-34">More expand and collapsible areas added to Attack Grid, Class Grid, Spellcaster class fields to hide complexity not needed by simpler characters.</li>
-				<li data-i18n="announce-35">Attack macrobook has base Melee, Ranged, and CMB buttons at top. Spellbook has Concentration and Casterlevel check buttons at top.</li>
-				<li data-i18n="announce-36">Spellbook, Skill'book', attacks, ability checks added above top menu. All can be dragged to macro bar.</li>
-				<li data-i18n="announce-31">Non english speakers, please assist with translating this sheet. Details at the 'help translate' link in the footer.</li>
-				<li data-i18n="announce-25"><strong>Skillbook button available</strong> on the skills page. Displays skill choices in chat area. Drag it to macro bar like other buttons.</li>
-				<li data-i18n="announce-26">replace</li>
 				<ol>
-					<li data-i18n="announce-27">test</li>
-					<li data-i18n="announce-28">replace</li>
-					<li data-i18n="announce-29">replace</li>
-					<li data-i18n="announce-30">replace</li>
+				<li data-i18n="announce-30">GMs, ensure <strong>IS NPC</strong> is checked on all monster sheets. Starting with version 1.00 IS NPC will be a flag for the sheet to behave differently.</li>
+				<li data-i18n="announce-28">import monster</li>
+				<li data-i18n="announce-38">parsing</li>
 				</ol>
-				<li data-i18n="announce-23"><strong>IF YOU USED SKILL TAKE 10 or TAKE 20 or INVESTIGATOR DICE DROPDOWN</strong> You must reset it by changing the dropdown values and changing them back.</li>
-				<li data-i18n="announce-24">Damage bonus fixed. Other fixes found at this link: http://tinyurl.com/PF-Thread</li>
-				<li data-i18n="announce-16"><strong>IF TABS ARE FROZEN</strong> click on <strong>EXPAND ALL</strong> checkbox to the right, then close and reopen character sheet. This will expand all areas as a workaruond until it is fixed. We are in communication with Roll 20 on the matter.</li>
-				<li data-i18n="announce-17" class="sheet-selectable"><strong>IF TABS ARE FROZEN</strong> please help by opening the javacript console on your browser (press F12) and save the console. Paste the console, along with the name of your operating system and browser, to: https://app.roll20.net/forum/post/3586462/pf-tabbing-on-character-sheets-stops-working</li>
-				<li data-i18n="announce-18">Attacks now have 'insert' macros that allow you to add a macro to the attack roll and damage roll. Each attack has 3 insert macros: one per attack, one per attack type (melee/ ranged / cmb) and one global.</li>
-				<li data-i18n="announce-19">Also are new macros for extra damage. One per attack and one global each of: non critical (sneak attack, flame weapon, etc), and critical only (flaming burst weapon, bleeding critical, etc)</li>
-				<li data-i18n="announce-20">Sheet has attempted to update your attack macros. If one does not work, and you have not customized it, simply delete the macro for that row and click in another field. This will reset the macro. Repeeat for iterative attacks if necessary.</li>
-				<li data-i18n="announce-21">Spells now have a spontaneous / prepared switch in the "Spells Per Day" section per class.</li>
-				<li data-i18n="announce-22">On skills page you can check to add a dropdown to Take 10 or Take 20 to skill rolls, and to add Investigator dice to rolls.</li>
-				<li data-i18n="announce-15">Spell book and attack macros now available. Above the list of attacks and list of spells are buttons. Click these and the list of available spells or attacks shows up in the chat area. Click the spell or attack and it will perform the roll you chose. You can also drag these buttons to your macro bar or call them from macros.</li>
-				<li data-i18n="announce-14">Many bug fixes.</li>
-				<li data-i18n="announce-13">New screenreader friendly rolltemplates have been added. Check the <em>Use Simple Templates</em> checkbox on the Config tab, Roll Template section, or add an attribute called <strong>toggle_accessible_flag</strong> and set it to <strong>{{accessible=true}}</strong>.  </li>
-				<li data-i18n="announce-12">All spell IDs have changed. <strong>You must update your macros.</strong> After updating macros you must go to the config tab and delete spells with old IDs.</li>
-				<li data-i18n="announce-11">Attack and damage effects on the Attacks tab have been migrated to the Buffs section.</li>
-				<li data-i18n="announce-10">Buffs have been changed to repeating sections. Names of buff totals have not changed.</li>
-				<li data-i18n="announce-09">New Psionic ability sections have been added based on Psionics Unlimited</li>
-				<li data-i18n="announce-08">The &#x2637; button on the right will split a repeating section into two columns. The &#x2630; will change it back to one column.  </li>
-				<li data-i18n="announce-07">Rolltemplate backgrounds can be assigned colors. Choose a color on the config tab in the RollTemplate section.</li>
-				<li data-i18n="announce-06">Buttons within repeating sections can now be dragged to the macro quick bar. To learn the id/name of a button, drag/drop it to the macro quick bar, use the button, click in chat and hit the UP arrow. Each repeating row now includes the row ID.</li>
-				<li data-i18n="announce-05">All ability macros that utilize <strong>repeating attributes</strong> must be edited to include "<strong>$</strong>". e.g. @{repeating_foo_X_...} should be renamed @{repeating_foo_$X_...} where "<b>X</b>" is the row of the repeating section.</li>
-				<li data-i18n="announce-04">For macro calls to <strong>button rolls</strong> in repeating rows, you must do the above ($) and you must add "_roll" to the end. For attacks, add "-roll".</li>
-				<li data-i18n="announce-03">For <strong>existing characters/NPC's</strong>, if you do not see Version > 0 listed (top-right corner of sheet), use the Refresh Button to force a refresh of all auto-calculated attributes. This should only need to be done once and could take up to 10s.</li>
-				<li data-i18n="announce-02">If the sheet has been recalculated and you still have empty auto-calculated fields, you may have to toggle(change attribute value(s)) of sub-component attributes to help generate a value for the empty fields.</li>
-				<li data-i18n="announce-01">
-					If you changed the attributes/fields listed below, you must update to the new version of the attribute/field (same location on sheet) because the new fields are only modifiers to the calculations which are done within sheet workers(javascript).:
-					<ol>
-						<li>HP-formula</li>
-						<li>max-skill-ranks-formula</li>
-					</ol>
-				</li>
-				<li data-i18n="announce-01">Weapon notes and header images can now be set independently from within the attack Options. You may have to clear @{macro_options} (located within Options) if you receive a missing attribute error.</li>
 			</ol>
+			<input type="checkbox" name="attr_attention0-show" value="1" checked class="sheet-showarrow sheet-ack-button" aria-label="Show Announcements" data-i18n-aria-label="show-announcements" />
+			<h2 class="sheet-showsect"><label data-i18n-title="show-announcements" data-i18n="announcements-old">Old Announcements</label></h2>
+			<div class="sheet-sect sheet-announcements">
+				<ol>
+					<li data-i18n="announce-39">39</li>
+					<li data-i18n="announce-34">More expand and collapsible areas added to Attack Grid, Class Grid, Spellcaster class fields to hide complexity not needed by simpler characters.</li>
+					<li data-i18n="announce-35">Attack macrobook has base Melee, Ranged, and CMB buttons at top. Spellbook has Concentration and Casterlevel check buttons at top.</li>
+					<li data-i18n="announce-36">Spellbook, Skill'book', attacks, ability checks added above top menu. All can be dragged to macro bar.</li>
+					<li data-i18n="announce-31">Non english speakers, please assist with translating this sheet. Details at the 'help translate' link in the footer.</li>
+					<li data-i18n="announce-25"><strong>Skillbook button available</strong> on the skills page. Displays skill choices in chat area. Drag it to macro bar like other buttons.</li>
+					<li data-i18n="announce-23"><strong>IF YOU USED SKILL TAKE 10 or TAKE 20 or INVESTIGATOR DICE DROPDOWN</strong> You must reset it by changing the dropdown values and changing them back.</li>
+					<li data-i18n="announce-24">Damage bonus fixed. Other fixes found at this link: http://tinyurl.com/PF-Thread</li>
+					<li data-i18n="announce-16"><strong>IF TABS ARE FROZEN</strong> click on <strong>EXPAND ALL</strong> checkbox to the right, then close and reopen character sheet. This will expand all areas as a workaruond until it is fixed. We are in communication with Roll 20 on the matter.</li>
+					<li data-i18n="announce-17" class="sheet-selectable"><strong>IF TABS ARE FROZEN</strong> please help by opening the javacript console on your browser (press F12) and save the console. Paste the console, along with the name of your operating system and browser, to: https://app.roll20.net/forum/post/3586462/pf-tabbing-on-character-sheets-stops-working</li>
+					<li data-i18n="announce-18">Attacks now have 'insert' macros that allow you to add a macro to the attack roll and damage roll. Each attack has 3 insert macros: one per attack, one per attack type (melee/ ranged / cmb) and one global.</li>
+					<li data-i18n="announce-19">Also are new macros for extra damage. One per attack and one global each of: non critical (sneak attack, flame weapon, etc), and critical only (flaming burst weapon, bleeding critical, etc)</li>
+					<li data-i18n="announce-20">Sheet has attempted to update your attack macros. If one does not work, and you have not customized it, simply delete the macro for that row and click in another field. This will reset the macro. Repeeat for iterative attacks if necessary.</li>
+					<li data-i18n="announce-21">Spells now have a spontaneous / prepared switch in the "Spells Per Day" section per class.</li>
+					<li data-i18n="announce-22">On skills page you can check to add a dropdown to Take 10 or Take 20 to skill rolls, and to add Investigator dice to rolls.</li>
+					<li data-i18n="announce-15">Spell book and attack macros now available. Above the list of attacks and list of spells are buttons. Click these and the list of available spells or attacks shows up in the chat area. Click the spell or attack and it will perform the roll you chose. You can also drag these buttons to your macro bar or call them from macros.</li>
+					<li data-i18n="announce-14">Many bug fixes.</li>
+					<li data-i18n="announce-13">New screenreader friendly rolltemplates have been added. Check the <em>Use Simple Templates</em> checkbox on the Config tab, Roll Template section, or add an attribute called <strong>toggle_accessible_flag</strong> and set it to <strong>{{accessible=true}}</strong>.  </li>
+					<li data-i18n="announce-12">All spell IDs have changed. <strong>You must update your macros.</strong> After updating macros you must go to the config tab and delete spells with old IDs.</li>
+					<li data-i18n="announce-11">Attack and damage effects on the Attacks tab have been migrated to the Buffs section.</li>
+					<li data-i18n="announce-10">Buffs have been changed to repeating sections. Names of buff totals have not changed.</li>
+					<li data-i18n="announce-09">New Psionic ability sections have been added based on Psionics Unlimited</li>
+					<li data-i18n="announce-08">The &#x2637; button on the right will split a repeating section into two columns. The &#x2630; will change it back to one column.  </li>
+					<li data-i18n="announce-07">Rolltemplate backgrounds can be assigned colors. Choose a color on the config tab in the RollTemplate section.</li>
+					<li data-i18n="announce-06">Buttons within repeating sections can now be dragged to the macro quick bar. To learn the id/name of a button, drag/drop it to the macro quick bar, use the button, click in chat and hit the UP arrow. Each repeating row now includes the row ID.</li>
+					<li data-i18n="announce-05">All ability macros that utilize <strong>repeating attributes</strong> must be edited to include "<strong>$</strong>". e.g. @{repeating_foo_X_...} should be renamed @{repeating_foo_$X_...} where "<b>X</b>" is the row of the repeating section.</li>
+					<li data-i18n="announce-04">For macro calls to <strong>button rolls</strong> in repeating rows, you must do the above ($) and you must add "_roll" to the end. For attacks, add "-roll".</li>
+					<li data-i18n="announce-03">For <strong>existing characters/NPC's</strong>, if you do not see Version > 0 listed (top-right corner of sheet), use the Refresh Button to force a refresh of all auto-calculated attributes. This should only need to be done once and could take up to 10s.</li>
+					<li data-i18n="announce-02">If the sheet has been recalculated and you still have empty auto-calculated fields, you may have to toggle(change attribute value(s)) of sub-component attributes to help generate a value for the empty fields.</li>
+					<li data-i18n="announce-01">
+						If you changed the attributes/fields listed below, you must update to the new version of the attribute/field (same location on sheet) because the new fields are only modifiers to the calculations which are done within sheet workers(javascript).:
+						<ol>
+							<li>HP-formula</li>
+							<li>max-skill-ranks-formula</li>
+						</ol>
+					</li>
+					<li data-i18n="announce-01">Weapon notes and header images can now be set independently from within the attack Options. You may have to clear @{macro_options} (located within Options) if you receive a missing attribute error.</li>
+				</ol>
+			</div>
 		</div>
 	</div>
 	<div role="banner" class="sheet-section-header">
@@ -239,70 +239,82 @@
 					</div>
 					<input class="sheet-nextitem-show" type="checkbox" title="@{repeating_buff_$X_buff-Fort-show}" name="attr_buff-Fort-show" value="1" />
 					<div class="sheet-linked-fields sheet-b-fort">
-						<label class="sheet-small-label2 sheet-macro-text-inline"><input type="text" name="attr_buff-Fort_macro-text" title="@{repeating_buff_$X_buff-Fort_macro-text}" placeholder="# or Macro" value="" data-i18n-placeholder="number-or-macro-text-place" /><span data-i18n="fortitude-calculation-abbrv">Fort Calc</span></label>
-						<label class="sheet-small-label2 sheet-number"><input type="number" name="attr_buff-Fort" title="@{repeating_buff_$X_buff-Fort}" value="0" class="sheet-calc" readonly /><span data-i18n="fortitude-abbrv">Fort</span></label>
+						<input type="checkbox" name="attr_buff-Fort_error" class="sheet-warn-mshow" value="1" />
+						<label class="sheet-small-label2 sheet-macro-text-inline sheet-highlight"><input type="text" name="attr_buff-Fort_macro-text" title="@{repeating_buff_$X_buff-Fort_macro-text}" placeholder="# or Macro" value="" data-i18n-placeholder="number-or-macro-text-place" /><span data-i18n="fortitude-calculation-abbrv">Fort Calc</span></label>
+						<label class="sheet-small-label2 sheet-number sheet-highlight"><input type="number" name="attr_buff-Fort" title="@{repeating_buff_$X_buff-Fort}" value="0" class="sheet-calc" readonly /><span data-i18n="fortitude-abbrv">Fort</span></label>
 					</div>
 					<input class="sheet-nextitem-show" type="checkbox" title="@{repeating_buff_$X_buff-Ref-show}" name="attr_buff-Ref-show" value="1" />
 					<div class="sheet-linked-fields sheet-b-ref">
-						<label class="sheet-small-label2 sheet-macro-text-inline"><input type="text" name="attr_buff-Ref_macro-text" title="@{repeating_buff_$X_buff-Ref_macro-text}" placeholder="# or Macro" value="" data-i18n-placeholder="number-or-macro-text-place" /><span data-i18n="reflex-calculation-abbrv">Ref Calc</span></label>
-						<label class="sheet-small-label2 sheet-number"><input type="number" name="attr_buff-Ref" title="@{repeating_buff_$X_buff-Ref}" value="0" class="sheet-calc" readonly /><span data-i18n="reflex-abbrv">Ref</span></label>
+						<input type="checkbox" name="attr_buff-Ref_error" class="sheet-warn-mshow" value="1" />
+						<label class="sheet-small-label2 sheet-macro-text-inline sheet-highlight"><input type="text" name="attr_buff-Ref_macro-text" title="@{repeating_buff_$X_buff-Ref_macro-text}" placeholder="# or Macro" value="" data-i18n-placeholder="number-or-macro-text-place" /><span data-i18n="reflex-calculation-abbrv">Ref Calc</span></label>
+						<label class="sheet-small-label2 sheet-number sheet-highlight"><input type="number" name="attr_buff-Ref" title="@{repeating_buff_$X_buff-Ref}" value="0" class="sheet-calc" readonly /><span data-i18n="reflex-abbrv">Ref</span></label>
 					</div>
 					<input class="sheet-nextitem-show" type="checkbox" title="@{repeating_buff_$X_buff-Will-show}" name="attr_buff-Will-show" value="1" />
 					<div class="sheet-linked-fields sheet-b-will">
-						<label class="sheet-small-label2 sheet-macro-text-inline"><input type="text" name="attr_buff-Will_macro-text" title="@{repeating_buff_$X_buff-Will_macro-text}" placeholder="# or Macro" value="" data-i18n-placeholder="number-or-macro-text-place" /><span data-i18n="willpower-calculation-abbrv">Will Calc</span></label>
-						<label class="sheet-small-label2 sheet-number"><input type="number" name="attr_buff-Will" title="@{repeating_buff_$X_buff-Will}" value="0" class="sheet-calc" readonly /><span data-i18n="willpower-abbrv">Will</span></label>
+						<input type="checkbox" name="attr_buff-Will_error" class="sheet-warn-mshow" value="1" />
+						<label class="sheet-small-label2 sheet-macro-text-inline sheet-highlight"><input type="text" name="attr_buff-Will_macro-text" title="@{repeating_buff_$X_buff-Will_macro-text}" placeholder="# or Macro" value="" data-i18n-placeholder="number-or-macro-text-place" /><span data-i18n="willpower-calculation-abbrv">Will Calc</span></label>
+						<label class="sheet-small-label2 sheet-number sheet-highlight"><input type="number" name="attr_buff-Will" title="@{repeating_buff_$X_buff-Will}" value="0" class="sheet-calc" readonly /><span data-i18n="willpower-abbrv">Will</span></label>
 					</div>
 					<input class="sheet-nextitem-show" type="checkbox" title="@{repeating_buff_$X_buff-AC-show}" name="attr_buff-AC-show" value="1" />
 					<div class="sheet-linked-fields sheet-b-ac">
-						<label class="sheet-small-label2 sheet-macro-text-inline"><input type="text" name="attr_buff-AC_macro-text" title="@{repeating_buff_$X_buff-AC_macro-text}" placeholder="# or Macro" value="" data-i18n-placeholder="number-or-macro-text-place" /><span data-i18n="armor-class-calculation-abbrv">AC Calc</span></label>
-						<label class="sheet-small-label2 sheet-number"><input type="number" name="attr_buff-AC" title="@{repeating_buff_$X_buff-AC}" value="0" class="sheet-calc" readonly /><span data-i18n="armor-class-abbrv">AC</span></label>
+						<input type="checkbox" name="attr_buff-AC_error" class="sheet-warn-mshow" value="1" />
+						<label class="sheet-small-label2 sheet-macro-text-inline sheet-highlight"><input type="text" name="attr_buff-AC_macro-text" title="@{repeating_buff_$X_buff-AC_macro-text}" placeholder="# or Macro" value="" data-i18n-placeholder="number-or-macro-text-place" /><span data-i18n="armor-class-calculation-abbrv">AC Calc</span></label>
+						<label class="sheet-small-label2 sheet-number sheet-highlight"><input type="number" name="attr_buff-AC" title="@{repeating_buff_$X_buff-AC}" value="0" class="sheet-calc" readonly /><span data-i18n="armor-class-abbrv">AC</span></label>
 					</div>
 					<input class="sheet-nextitem-show" type="checkbox" title="@{repeating_buff_$X_buff-Touch-show}" name="attr_buff-Touch-show" value="1" />
 					<div class="sheet-linked-fields sheet-b-touch">
-						<label class="sheet-small-label2 sheet-macro-text-inline"><input type="text" name="attr_buff-Touch_macro-text" title="@{repeating_buff_$X_buff-Touch_macro-text}" placeholder="# or Macro" value="" data-i18n-placeholder="number-or-macro-text-place" /><span data-i18n="touch-armor-class-calculation-abbrv">Touch Calc</span></label>
-						<label class="sheet-small-label2 sheet-number"><input type="number" name="attr_buff-Touch" title="@{repeating_buff_$X_buff-Touch}" value="0" class="sheet-calc" readonly /><span data-i18n="touch-armor-class-abbrv">Touch</span></label>
+						<input type="checkbox" name="attr_buff-Touch_error" class="sheet-warn-mshow" value="1" />
+						<label class="sheet-small-label2 sheet-macro-text-inline sheet-highlight"><input type="text" name="attr_buff-Touch_macro-text" title="@{repeating_buff_$X_buff-Touch_macro-text}" placeholder="# or Macro" value="" data-i18n-placeholder="number-or-macro-text-place" /><span data-i18n="touch-armor-class-calculation-abbrv">Touch Calc</span></label>
+						<label class="sheet-small-label2 sheet-number sheet-highlight"><input type="number" name="attr_buff-Touch" title="@{repeating_buff_$X_buff-Touch}" value="0" class="sheet-calc" readonly /><span data-i18n="touch-armor-class-abbrv">Touch</span></label>
 					</div>
 					<input class="sheet-nextitem-show" type="checkbox" title="@{repeating_buff_$X_buff-CMD-show}" name="attr_buff-CMD-show" value="1" />
 					<div class="sheet-linked-fields sheet-b-cmd">
-						<label class="sheet-small-label2 sheet-macro-text-inline"><input type="text" name="attr_buff-CMD_macro-text" title="@{repeating_buff_$X_buff-CMD_macro-text}" placeholder="# or Macro" value="" data-i18n-placeholder="number-or-macro-text-place" /><span data-i18n="combat-maneuver-defense-calculation-abbrv">CMD Calc</span></label>
-						<label class="sheet-small-label2 sheet-number"><input type="number" name="attr_buff-CMD" title="@{repeating_buff_$X_buff-CMD}" value="0" class="sheet-calc" readonly /><span data-i18n="combat-maneuver-defense-abbrv">CMD</span></label>
+						<input type="checkbox" name="attr_buff-CMD_error" class="sheet-warn-mshow" value="1" />
+						<label class="sheet-small-label2 sheet-macro-text-inline sheet-highlight"><input type="text" name="attr_buff-CMD_macro-text" title="@{repeating_buff_$X_buff-CMD_macro-text}" placeholder="# or Macro" value="" data-i18n-placeholder="number-or-macro-text-place" /><span data-i18n="combat-maneuver-defense-calculation-abbrv">CMD Calc</span></label>
+						<label class="sheet-small-label2 sheet-number sheet-highlight"><input type="number" name="attr_buff-CMD" title="@{repeating_buff_$X_buff-CMD}" value="0" class="sheet-calc" readonly /><span data-i18n="combat-maneuver-defense-abbrv">CMD</span></label>
 					</div>
 					<input class="sheet-nextitem-show" type="checkbox" title="@{repeating_buff_$X_buff-Melee-show}" name="attr_buff-Melee-show" value="1" />
 					<div class="sheet-linked-fields sheet-b-melee">
-						<label class="sheet-small-label2 sheet-macro-text-inline"><input type="text" name="attr_buff-Melee_macro-text" title="@{repeating_buff_$X_buff-Melee_macro-text}" placeholder="# or Macro" value="" data-i18n-placeholder="number-or-macro-text-place" /><span data-i18n="melee-calculation">Melee Calc</span></label>
-						<label class="sheet-small-label2 sheet-number"><input type="number" name="attr_buff-Melee" title="@{repeating_buff_$X_buff-Melee}" value="0" class="sheet-calc" readonly /><span data-i18n="melee">Melee</span></label>
+						<input type="checkbox" name="attr_buff-Melee_error" class="sheet-warn-mshow" value="1" />
+						<label class="sheet-small-label2 sheet-macro-text-inline sheet-highlight"><input type="text" name="attr_buff-Melee_macro-text" title="@{repeating_buff_$X_buff-Melee_macro-text}" placeholder="# or Macro" value="" data-i18n-placeholder="number-or-macro-text-place" /><span data-i18n="melee-calculation">Melee Calc</span></label>
+						<label class="sheet-small-label2 sheet-number sheet-highlight"><input type="number" name="attr_buff-Melee" title="@{repeating_buff_$X_buff-Melee}" value="0" class="sheet-calc" readonly /><span data-i18n="melee">Melee</span></label>
 					</div>
 					<input class="sheet-nextitem-show" type="checkbox" title="@{repeating_buff_$X_buff-Ranged-show}" name="attr_buff-Ranged-show" value="1" />
 					<div class="sheet-linked-fields sheet-b-ranged">
-						<label class="sheet-small-label2 sheet-macro-text-inline"><input type="text" name="attr_buff-Ranged_macro-text" title="@{repeating_buff_$X_buff-Ranged_macro-text}" placeholder="# or Macro" value="" data-i18n-placeholder="number-or-macro-text-place" /><span data-i18n="ranged-calculation">Ranged Calc</span></label>
-						<label class="sheet-small-label2 sheet-number"><input type="number" name="attr_buff-Ranged" title="@{repeating_buff_$X_buff-Ranged}" value="0" class="sheet-calc" readonly /><span data-i18n="ranged">Ranged</span></label>
+						<input type="checkbox" name="attr_buff-Ranged_error" class="sheet-warn-mshow" value="1" />
+						<label class="sheet-small-label2 sheet-macro-text-inline sheet-highlight"><input type="text" name="attr_buff-Ranged_macro-text" title="@{repeating_buff_$X_buff-Ranged_macro-text}" placeholder="# or Macro" value="" data-i18n-placeholder="number-or-macro-text-place" /><span data-i18n="ranged-calculation">Ranged Calc</span></label>
+						<label class="sheet-small-label2 sheet-number sheet-highlight"><input type="number" name="attr_buff-Ranged" title="@{repeating_buff_$X_buff-Ranged}" value="0" class="sheet-calc" readonly /><span data-i18n="ranged">Ranged</span></label>
 					</div>
 					<input class="sheet-nextitem-show" type="checkbox" title="@{repeating_buff_$X_buff-DMG-show}" name="attr_buff-DMG-show" value="1" />
 					<div class="sheet-linked-fields sheet-b-dmg">
-						<label class="sheet-small-label2 sheet-macro-text-inline"><input type="text" name="attr_buff-DMG_macro-text" title="@{repeating_buff_$X_buff-DMG_macro-text}" placeholder="# or Macro" value="" data-i18n-placeholder="number-or-macro-text-place" /><span data-i18n="damage-calculation-abbrv">DMG Calc</span></label>
-						<label class="sheet-small-label2 sheet-number"><input type="number" name="attr_buff-DMG" title="@{repeating_buff_$X_buff-DMG}" value="0" class="sheet-calc" readonly /><span data-i18n="damage-abbrv">DMG</span></label>
+						<input type="checkbox" name="attr_buff-DMG_error" class="sheet-warn-mshow" value="1" />
+						<label class="sheet-small-label2 sheet-macro-text-inline sheet-highlight"><input type="text" name="attr_buff-DMG_macro-text" title="@{repeating_buff_$X_buff-DMG_macro-text}" placeholder="# or Macro" value="" data-i18n-placeholder="number-or-macro-text-place" /><span data-i18n="damage-calculation-abbrv">DMG Calc</span></label>
+						<label class="sheet-small-label2 sheet-number sheet-highlight"><input type="number" name="attr_buff-DMG" title="@{repeating_buff_$X_buff-DMG}" value="0" class="sheet-calc" readonly /><span data-i18n="damage-abbrv">DMG</span></label>
 					</div>
 					<input class="sheet-nextitem-show" type="checkbox" title="@{repeating_buff_$X_buff-Check-show}" name="attr_buff-Check-show" value="1" />
 					<div class="sheet-linked-fields sheet-b-check">
-						<label class="sheet-small-label2 sheet-macro-text-inline"><input type="text" name="attr_buff-Check_macro-text" title="@{repeating_buff_$X_buff-Check_macro-text} Skill and ability check" placeholder="# or Macro" value="" data-i18n-placeholder="number-or-macro-text-place" /><span data-i18n="check-calculation">Check Calc</span></label>
-						<label class="sheet-small-label2 sheet-number"><input type="number" name="attr_buff-Check" title="@{repeating_buff_$X_buff-Check} Skill and ability check" value="0" class="sheet-calc" readonly /><span data-i18n="check">Check</span></label>
+						<input type="checkbox" name="attr_buff-Check_error" class="sheet-warn-mshow" value="1" />
+						<label class="sheet-small-label2 sheet-macro-text-inline sheet-highlight"><input type="text" name="attr_buff-Check_macro-text" title="@{repeating_buff_$X_buff-Check_macro-text} Skill and ability check" placeholder="# or Macro" value="" data-i18n-placeholder="number-or-macro-text-place" /><span data-i18n="check-calculation">Check Calc</span></label>
+						<label class="sheet-small-label2 sheet-number sheet-highlight"><input type="number" name="attr_buff-Check" title="@{repeating_buff_$X_buff-Check} Skill and ability check" value="0" class="sheet-calc" readonly /><span data-i18n="check">Check</span></label>
 					</div>
 					<input class="sheet-nextitem-show" type="checkbox" title="@{repeating_buff_$X_buff-CasterLevel-show}" name="attr_buff-CasterLevel-show" value="1" />
 					<div class="sheet-linked-fields sheet-b-casterlevel">
-						<label class="sheet-small-label2 sheet-macro-text-inline"><input type="text" name="attr_buff-CasterLevel_macro-text" title="@{repeating_buff_$X_buff-CasterLevel_macro-text}" placeholder="# or Macro" value="" data-i18n-placeholder="number-or-macro-text-place" /><span data-i18n="caster-level-calculation">Caster Lvl Calc</span></label>
-						<label class="sheet-small-label2 sheet-number"><input type="number" name="attr_buff-CasterLevel" title="@{repeating_buff_$X_buff-CasterLevel}" value="0" class="sheet-calc" readonly /><span data-i18n="caster-level-abbrv">CL</span></label>
+						<input type="checkbox" name="attr_buff-CasterLevel_error" class="sheet-warn-mshow" value="1" />
+						<label class="sheet-small-label2 sheet-macro-text-inline sheet-highlight"><input type="text" name="attr_buff-CasterLevel_macro-text" title="@{repeating_buff_$X_buff-CasterLevel_macro-text}" placeholder="# or Macro" value="" data-i18n-placeholder="number-or-macro-text-place" /><span data-i18n="caster-level-calculation">Caster Lvl Calc</span></label>
+						<label class="sheet-small-label2 sheet-number sheet-highlight"><input type="number" name="attr_buff-CasterLevel" title="@{repeating_buff_$X_buff-CasterLevel}" value="0" class="sheet-calc" readonly /><span data-i18n="caster-level-abbrv">CL</span></label>
 					</div>
 					<input class="sheet-nextitem-show" type="checkbox" title="@{repeating_buff_$X_buff-HP-temp-show}" name="attr_buff-HP-temp-show" value="1" />
 					<div class="sheet-linked-fields sheet-b-hp-temp">
-						<label class="sheet-small-label2 sheet-macro-text-inline"><input type="text" name="attr_buff-HP-temp_macro-text" title="@{repeating_buff_$X_buff-HP-temp_macro-text}" placeholder="# or Macro" value="" data-i18n-placeholder="number-or-macro-text-place" /><span data-i18n="temporary-hit-points-calculation-abbrv">Temp HP Calc</span></label>
-						<label class="sheet-small-label2 sheet-number"><input type="number" name="attr_buff-HP-temp" title="@{repeating_buff_$X_buff-HP-temp}" value="0" class="sheet-calc" readonly /><span data-i18n="hit-points-abbrv">HP</span></label>
+						<input type="checkbox" name="attr_buff-HP-temp_error" class="sheet-warn-mshow" value="1" />
+						<label class="sheet-small-label2 sheet-macro-text-inline sheet-highlight"><input type="text" name="attr_buff-HP-temp_macro-text" title="@{repeating_buff_$X_buff-HP-temp_macro-text}" placeholder="# or Macro" value="" data-i18n-placeholder="number-or-macro-text-place" /><span data-i18n="temporary-hit-points-calculation-abbrv">Temp HP Calc</span></label>
+						<label class="sheet-small-label2 sheet-number sheet-highlight"><input type="number" name="attr_buff-HP-temp" title="@{repeating_buff_$X_buff-HP-temp}" value="0" class="sheet-calc" readonly /><span data-i18n="hit-points-abbrv">HP</span></label>
 					</div>
 					<div class="sheet-sect sheet-expand">
 						<input type="checkbox" class="sheet-showarrow sheet-options-show" title="@{repeating_buff_$X_options-show}" name="attr_options-show" value="1" checked />
 						<label class="sheet-showsect sheet-options-showlabel" data-i18n="select-buffs">Select Buffs</label>
-						<input type="checkbox" class="sheet-showarrow sheet-desc-show" title="@{repeating_buff_$X_description-show}" name="attr_description-show" value="1" checked />
+						<input type="checkbox" class="sheet-showarrow sheet-desc-show" title="@{repeating_buff_$X_description-show}" name="attr_description-show" value="1" />
 						<label class="sheet-showsect sheet-desc-showlabel" data-i18n="notes">Notes</label>
-						<input type="checkbox" class="sheet-showarrow sheet-id-show" title="Click to expand" data-i18n-title="showsect-cmd" name="attr_ids-show" value="1" checked />
+						<input type="checkbox" class="sheet-showarrow sheet-id-show" title="Click to expand" data-i18n-title="showsect-cmd" name="attr_ids-show" value="1" />
 						<label class="sheet-showsect sheet-id-showlabel" data-i18n="identification-abbrv">ID</label>
 						<div class="sheet-cheat"></div>
 						<div class="sheet-table sheet-options">
@@ -1069,7 +1081,7 @@
 									<label class="sheet-showsect sheet-desc-showlabel" data-i18n="description">Description</label>
 									<input type="checkbox" class="sheet-showarrow sheet-macro-text-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Macro Text" name="attr_macro-text-show" value="1" checked />
 									<label class="sheet-showsect sheet-macro-text-showlabel" data-i18n="macro-text">Macro Text</label>
-									<input type="checkbox" class="sheet-showarrow sheet-id-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Row ID" name="attr_ids-show" value="1" checked />
+									<input type="checkbox" class="sheet-showarrow sheet-id-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Row ID" name="attr_ids-show" value="1"  />
 									<label class="sheet-showsect sheet-id-showlabel" data-i18n="identification-abbrv">ID</label>
 									<div class="sheet-cheat"></div>
 									<textarea class="sheet-desc" title="@{repeating_class-ability_$X_description}" name="attr_description" accept="Content"></textarea>
@@ -1131,7 +1143,7 @@
 										<label class="sheet-showsect sheet-desc-showlabel" data-i18n="description">Description</label>
 										<input type="checkbox" class="sheet-showarrow sheet-macro-text-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Macro Text" name="attr_macro-text-show" value="1" checked />
 										<label class="sheet-showsect sheet-macro-text-showlabel" data-i18n="macro-text">Macro Text</label>
-										<input type="checkbox" class="sheet-showarrow sheet-id-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Row ID" name="attr_ids-show" value="1" checked />
+										<input type="checkbox" class="sheet-showarrow sheet-id-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Row ID" name="attr_ids-show" value="1"  />
 										<label class="sheet-showsect sheet-id-showlabel" data-i18n="identification-abbrv">ID</label>
 										<div class="sheet-cheat"></div>
 										<textarea class="sheet-desc" title="@{repeating_feat_$X_description}" name="attr_description" accept="Content"></textarea>
@@ -1169,7 +1181,7 @@
 									<label class="sheet-showsect sheet-desc-showlabel" data-i18n="description">Description</label>
 									<input type="checkbox" class="sheet-showarrow sheet-macro-text-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Macro Text" name="attr_macro-text-show" value="1" checked />
 									<label class="sheet-showsect sheet-macro-text-showlabel" data-i18n="macro-text">Macro Text</label>
-									<input type="checkbox" class="sheet-showarrow sheet-id-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Row ID" name="attr_ids-show" value="1" checked />
+									<input type="checkbox" class="sheet-showarrow sheet-id-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Row ID" name="attr_ids-show" value="1"  />
 									<label class="sheet-showsect sheet-id-showlabel" data-i18n="identification-abbrv">ID</label>
 									<div class="sheet-cheat"></div>
 									<textarea class="sheet-desc" title="@{repeating_racial-trait_$X_description}" name="attr_description" accept="Content"></textarea>
@@ -1205,7 +1217,7 @@
 									<label class="sheet-showsect sheet-desc-showlabel" data-i18n="description">Description</label>
 									<input type="checkbox" class="sheet-showarrow sheet-macro-text-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Macro Text" name="attr_macro-text-show" value="1" checked />
 									<label class="sheet-showsect sheet-macro-text-showlabel" data-i18n="macro-text">Macro Text</label>
-									<input type="checkbox" class="sheet-showarrow sheet-id-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Row ID" name="attr_ids-show" value="1" checked />
+									<input type="checkbox" class="sheet-showarrow sheet-id-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Row ID" name="attr_ids-show" value="1"  />
 									<label class="sheet-showsect sheet-id-showlabel" data-i18n="identification-abbrv">ID</label>
 									<div class="sheet-cheat"></div>
 									<textarea class="sheet-desc" title="@{repeating_trait_$X_description}" name="attr_description" accept="Content"></textarea>
@@ -1249,7 +1261,7 @@
 									<label class="sheet-showsect sheet-desc-showlabel" data-i18n="description">Description</label>
 									<input type="checkbox" class="sheet-showarrow sheet-macro-text-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Macro Text" name="attr_macro-text-show" value="1" checked />
 									<label class="sheet-showsect sheet-macro-text-showlabel" data-i18n="macro-text">Macro Text</label>
-									<input type="checkbox" class="sheet-showarrow sheet-id-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Row ID" name="attr_ids-show" value="1" checked />
+									<input type="checkbox" class="sheet-showarrow sheet-id-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Row ID" name="attr_ids-show" value="1"  />
 									<label class="sheet-showsect sheet-id-showlabel" data-i18n="identification-abbrv">ID</label>
 									<div class="sheet-cheat"></div>
 									<textarea class="sheet-desc" title="@{repeating_mythic-ability_$X_description}" name="attr_description" accept="Content"></textarea>
@@ -1284,7 +1296,7 @@
 								<label class="sheet-showsect sheet-desc-showlabel" data-i18n="description">Description</label>
 								<input type="checkbox" class="sheet-showarrow sheet-macro-text-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Macro Text" name="attr_macro-text-show" value="1" checked />
 								<label class="sheet-showsect sheet-macro-text-showlabel" data-i18n="macro-text">Macro Text</label>
-								<input type="checkbox" class="sheet-showarrow sheet-id-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Row ID" name="attr_ids-show" value="1" checked />
+								<input type="checkbox" class="sheet-showarrow sheet-id-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Row ID" name="attr_ids-show" value="1"  />
 								<label class="sheet-showsect sheet-id-showlabel" data-i18n="identification-abbrv">ID</label>
 								<div class="sheet-cheat"></div>
 								<textarea class="sheet-desc" title="@{repeating_mythic-feat_$X_description}" name="attr_description"></textarea>
@@ -6712,7 +6724,7 @@
 							<label class="sheet-showsect sheet-desc-showlabel" data-i18n="description">Description</label>
 							<input type="checkbox" class="sheet-showarrow sheet-macro-text-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Macro Text" name="attr_macro-text-show" value="1" checked />
 							<label class="sheet-showsect sheet-macro-text-showlabel" data-i18n="macro-text">Macro Text</label>
-							<input type="checkbox" class="sheet-showarrow sheet-id-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Row ID" name="attr_ids-show" value="1" checked />
+							<input type="checkbox" class="sheet-showarrow sheet-id-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Row ID" name="attr_ids-show" value="1"  />
 							<label class="sheet-showsect sheet-id-showlabel" data-i18n="identification-abbrv">ID</label>
 							<div class="sheet-cheat"></div>
 							<textarea class="sheet-desc" title="@{repeating_item_$X_description}" name="attr_description"></textarea>
@@ -8708,7 +8720,7 @@
 									<div class="sheet-sect sheet-expand">
 										<input type="checkbox" class="sheet-showarrow sheet-macro-text-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Macro Text" name="attr_macro-text-show" value="1" checked />
 										<label class="sheet-showsect sheet-macro-text-showlabel" data-i18n="macro-text">Macro Text</label>
-										<input type="checkbox" class="sheet-showarrow sheet-id-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Row ID" name="attr_ids-show" value="1" checked />
+										<input type="checkbox" class="sheet-showarrow sheet-id-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Row ID" name="attr_ids-show" value="1"  />
 										<label class="sheet-showsect sheet-id-showlabel" data-i18n="identification-abbrv">ID</label>
 										<div class="sheet-cheat"></div>
 										<textarea class="sheet-macro-text" title="@{repeating_npc-spell-like-abilities_$X_macro-text}" name="attr_macro-text">@{NPC-whisper} &{template:pf_generic} @{toggle_accessible_flag} @{toggle_rounded_flag} {{color=@{rolltemplate_color}}} {{header_image=@{header_image-pf_generic}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=@{name}}} {{Level=@{level}}} {{Range=@{range}}} {{Duration=@{duration}}} {{Save=@{save}}} {{SR=@{sr}}} {{description=@{short-description}}}</textarea>
@@ -9086,7 +9098,7 @@
 										<label class="sheet-showsect sheet-desc-showlabel" data-i18n="description">Description</label>
 										<input type="checkbox" class="sheet-showarrow sheet-macro-text-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Macro Text" name="attr_macro-text-show" value="1" checked />
 										<label class="sheet-showsect sheet-macro-text-showlabel" data-i18n="macro-text">Macro Text</label>
-										<input type="checkbox" class="sheet-showarrow sheet-id-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Row ID" name="attr_ids-show" value="1" checked />
+										<input type="checkbox" class="sheet-showarrow sheet-id-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Row ID" name="attr_ids-show" value="1"  />
 										<label class="sheet-showsect sheet-id-showlabel" data-i18n="identification-abbrv">ID</label>
 										<div class="sheet-cheat"></div>
 										<textarea class="sheet-desc" title="@{repeating_feat_$X_description}" name="attr_description" accept="Content"></textarea>
@@ -9127,7 +9139,7 @@
 											<label class="sheet-showsect sheet-desc-showlabel" data-i18n="description">Description</label>
 											<input type="checkbox" class="sheet-showarrow sheet-macro-text-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Macro Text" name="attr_macro-text-show" value="1" checked />
 											<label class="sheet-showsect sheet-macro-text-showlabel" data-i18n="macro-text">Macro Text</label>
-											<input type="checkbox" class="sheet-showarrow sheet-id-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Row ID" name="attr_ids-show" value="1" checked />
+											<input type="checkbox" class="sheet-showarrow sheet-id-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Row ID" name="attr_ids-show" value="1"  />
 											<label class="sheet-showsect sheet-id-showlabel" data-i18n="identification-abbrv">ID</label>
 											<div class="sheet-cheat"></div>
 											<textarea class="sheet-desc" title="@{repeating_mythic-feat_$X_description}" name="attr_description"></textarea>
@@ -9579,7 +9591,7 @@
 									<label class="sheet-showsect sheet-desc-showlabel" data-i18n="description">Description</label>
 									<input type="checkbox" class="sheet-showarrow sheet-macro-text-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Macro Text" name="attr_macro-text-show" value="1" checked />
 									<label class="sheet-showsect sheet-macro-text-showlabel" data-i18n="macro-text">Macro Text</label>
-									<input type="checkbox" class="sheet-showarrow sheet-id-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Row ID" name="attr_ids-show" value="1" checked />
+									<input type="checkbox" class="sheet-showarrow sheet-id-show" title="Click to expand" data-i18n-title="showsect-cmd" aria-label="Show Row ID" name="attr_ids-show" value="1"  />
 									<label class="sheet-showsect sheet-id-showlabel" data-i18n="identification-abbrv">ID</label>
 									<div class="sheet-cheat"></div>
 									<textarea class="sheet-desc" title="@{repeating_racial-trait_$X_description}" name="attr_description" accept="Content"></textarea>
@@ -10883,7 +10895,7 @@
 	<div role="contentinfo" aria-label="Help links and footer information" data-i18n-aria-label="footer-aria" class="sheet-footer" style="margin-top:2em;">
 		<div class="sheet-table">
 			<div class="sheet-table-row">
-				<span class="sheet-table-cell"><span data-i18n="footer-info">Created by Samuel Marino w/contributions by Vince, Chris Buchholz, Magik, James W. | Last updated:</span> <i>11.21.2016&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 title="A non-blank version indicates attributes have been successfully recalculated."></span>
+				<span class="sheet-table-cell"><span data-i18n="footer-info">Created by Samuel Marino w/contributions by Vince, Chris Buchholz, Magik, James W. | Last updated:</span> <i>12.12.2016&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 title="A non-blank version indicates attributes have been successfully recalculated."></span>
 			</div>
 			<div class="sheet-table-row" style="font-size:.8em;">
 				<label style="font-weight:inherit;"><b data-i18n="questions-feedback">Questions/Feedback?:</b><span class="sheet-selectable" style="padding-left:1em;">http://tinyurl.com/PF-Thread</span></label>
@@ -12180,8 +12192,7 @@ var TAS = TAS || (function () {
 			notice: logNotice,
 			log: logLog
 		};
-	}
-	());
+	}());
 /* ---- END: TheAaronSheet.js ---- */
 //TAS.config({ logging: { info: false} });
 TAS.config({
@@ -12191,6 +12202,22 @@ TAS.config({
 	}
 });
 //TAS.debugMode();
+var CBHidden = (function (){
+console.log(' ');
+console.log(' ');
+console.log('         %cOOOOOO','background-color:blue;color:white;font-weight:bold;');
+console.log('      %cOOO      OOO','background-color:blue;color:white;font-weight:bold;');
+console.log('    %cOO   %c******%c   OO','background-color:blue;color:white;font-weight:bold;','background-color:red;color:white;font-weight:bold;','background-color:blue;color:white;font-weight:bold;');
+console.log('   %cO    %c**%c    %c**%c    O','background-color:blue;color:white;font-weight:bold;','background-color:red;color:white;font-weight:bold;','background-color:blue;color:white;font-weight:bold;','background-color:red;color:white;font-weight:bold;','background-color:blue;color:white;font-weight:bold;');
+console.log('  %cO    %c**%c            O','background-color:blue;color:white;font-weight:bold;','background-color:red;color:white;font-weight:bold;','background-color:blue;color:white;font-weight:bold;');
+console.log('  %cO    %c**%c            O','background-color:blue;color:white;font-weight:bold;','background-color:red;color:white;font-weight:bold;','background-color:blue;color:white;font-weight:bold;');
+console.log('  %cO    %c**%c            O','background-color:blue;color:white;font-weight:bold;','background-color:red;color:white;font-weight:bold;','background-color:blue;color:white;font-weight:bold;');
+console.log('   %cO    %c**%c    %c**%c    O','background-color:blue;color:white;font-weight:bold;','background-color:red;color:white;font-weight:bold;','background-color:blue;color:white;font-weight:bold;','background-color:red;color:white;font-weight:bold;','background-color:blue;color:white;font-weight:bold;');
+console.log('    %cOO   %c******%c   OO','background-color:blue;color:white;font-weight:bold;','background-color:red;color:white;font-weight:bold;','background-color:blue;color:white;font-weight:bold;');
+console.log('      %cOOO      OOO','background-color:blue;color:white;font-weight:bold;');
+console.log('	     %cOOOOOO','background-color:blue;color:white;font-weight:bold;');
+console.log(' ');	
+}());
 /** PFLog just a little helper to write to console without using TAS.log using fancy type
 */
 var PFLog = {
@@ -13197,8 +13224,7 @@ var ExExp = ExExp || (function () {
 			write: write,
 			handleExpression: handleExpression
 		};
-	}
-	());
+	}());
 /* SWUtils is only for interaction with ExExp */
 var SWUtils = SWUtils || (function () {
 		'use strict';
@@ -13304,10 +13330,10 @@ var SWUtils = SWUtils || (function () {
 				}
 				return str;
 			},
-			/* evaluateExpression
+			/** evaluateExpression
 			 *  reads in the string, evaluates it until we find a number, then passes that number to the callback.
-			 *  @exprStr= A string containing a mathematical expression, possibly containing references to fields such as @{myfield}
-			 *  @callback = a function taking one parameter, either a number or empty string .
+			 *  @param {string} exprStr= A string containing a mathematical expression, possibly containing references to fields such as @{myfield}
+			 *  @param {function} callback = a function taking one parameter, either a number or empty string .
 			 */
 			evaluateExpression = function (exprStr, callback) {
 				//TAS.debug("entered evaluateExpression; exprStr=" + exprStr + ", callback=" + callback);
@@ -13397,8 +13423,8 @@ var SWUtils = SWUtils || (function () {
 					});
 				});
 			},
-			/* called only by evaluateAndSetNumber */
-			/* evaluateAndSetNumber
+
+			/** evaluateAndSetNumber
 			 * Examines the string in readField, and tests to see if it is a number
 			 * if it's a number immediately write it to writeField.
 			 * if not, then replace any @{field} references with numbers, and then evaluate it
@@ -13406,20 +13432,27 @@ var SWUtils = SWUtils || (function () {
 			 *
 			 * note this is NOT recursive, you can't point one field of
 			 *
-			 * @readField {string}= field to read containing string to parse
-			 * @writeField {string}= field to write to
-			 * @dontForceOnBlank {boolean}= False (default): if writeField is empty overwrite no matter what,
-			 *               True: if writeField empty, then write only if readField evaluates to other than defaultVal||0.
-			 * @defaultVal {number}= optional, default to set if we cannot evaluate the field. If none set to 0.
-			 *
+			 * @param {string} readField= field to read containing string to parse
+			 * @param {string} writeField= field to write to
+			 * @param {number} defaultVal= optional, default to set if we cannot evaluate the field. If not supplied assume 0
+			 * @param {function} callback - function(newval, oldval, ischanged)
+			 * @param {bool} silently if true set new val with {silent:true}
+			 * @param {function} errcallback  call if there was an error parsing string function(newval, oldval, ischanged)
 			 */
-			evaluateAndSetNumber = function (readField, writeField, defaultVal, callback, silently) {
+			evaluateAndSetNumber = function (readField, writeField, defaultVal, callback, silently, errcallback) {
 				var done = function (a, b, c) {
-						if (typeof callback === "function") {
-							callback(a, b, c);
-						}
-					},
-					params = {};
+					if (typeof callback === "function") {
+						callback(a, b, c);
+					}
+				},
+				errordone = function(a,b,c){
+					if (typeof errcallback === "function") {
+						errcallback(a, b, c);
+					} else {
+						done(a,b,c);
+					}
+				},
+				params = {};
 				if (silently) {
 					params.silent = true;
 				}
@@ -13429,9 +13462,10 @@ var SWUtils = SWUtils || (function () {
 						currVal = parseInt(values[writeField], 10),
 						value = Number(values[readField]);
 					try {
-						if (typeof values[readField] === "undefined") {
+						//check for blank
+						if (typeof values[readField] === "undefined" || !values[readField] || values[readField]===null || values[readField]==="" ) {
 							value = 0;
-							if (currVal !== 0) {
+							if (currVal !== value || isNaN(currVal)) {
 								setter[writeField] = value;
 								setAttrs(setter, params, function () {
 									done(value, currVal, true);
@@ -13440,6 +13474,7 @@ var SWUtils = SWUtils || (function () {
 								done(value, currVal, false);
 							}
 						} else if (!isNaN(value)) {
+							//check for number
 							if (currVal !== value) {
 								setter[writeField] = value;
 								setAttrs(setter, params, function () {
@@ -13450,25 +13485,40 @@ var SWUtils = SWUtils || (function () {
 							}
 						} else {
 							evaluateExpression(values[readField], function (value2) {
+								var isError=0;
 								try {
-									if (value2 === null || value2===undefined || isNaN(value2)) {value2=trueDefault;}
+									if (value2 === null || value2===undefined || isNaN(value2)) {
+										isError=1;
+										value2=trueDefault;
+									}
 									if (isNaN(currVal) || currVal !== value2) {
 										setter[writeField] = value2;
-										setAttrs(setter, params, function () {
-											done(value2, currVal, true);
-										});
-									} else {
-										done(currVal, currVal, false);
-									}
+									} 
 								} catch (err2) {
 									TAS.error("evaluateAndSetNumber after evaluateExpression ", err2);
-									done(currVal, currVal, false);
+									isError=1;
+								} finally {
+									if (_.size(setter)>0){
+										setAttrs(setter, params, function () {
+											if (!isError){
+												done(value2, currVal, true);
+											} else {
+												errordone(value2,currVal,true);
+											}
+										});
+									} else {
+										if (!isError){
+											done(currVal, currVal, false);
+										} else {
+											errordone(value2,currVal,false);
+										}
+									}
 								}
 							});
 						}
 					} catch (err) {
 						TAS.error("evaluateAndSetNumber", err);
-						done(value, currVal, false);
+						errordone(value, currVal, false);
 					}
 				});
 			},
@@ -13783,10 +13833,9 @@ var SWUtils = SWUtils || (function () {
 			updateRowTotal: updateRowTotal,
 			validNumericStr: validNumericStr
 		};
-	}
-	());
+	}());
 var PFConst = {
-	version: 0.71,
+	version: 0.72,
 	/***************************************Lists of Fields ************************************************************/
 	//add any new repeating sections here. This is the word after "repeating_"
 	repeatingSections: ["weapon", "class-ability", "feat", "racial-trait", "trait", "item", "npc-spell-like-abilities", "mythic-ability", "mythic-feat", "buff", "spells"],
@@ -14340,8 +14389,7 @@ var PFUtils = PFUtils || (function () {
 			getWoundPenalty: getWoundPenalty,
 			getSizeFromText: getSizeFromText
 		};
-	}
-	());
+	}());
 var PFUtilsAsync = PFUtilsAsync || (function () {
 		'use strict';
 		/****************************ASYNCRHOUNOUS UTILITIES ***********************************
@@ -14425,8 +14473,7 @@ var PFUtilsAsync = PFUtilsAsync || (function () {
 			setRowIds: setRowIds,
 			setRowId: setRowId
 		};
-	}
-	());
+	}());
 var PFAbilityScores = PFAbilityScores || (function () {
 		'use strict';
 		var abilities = ["STR", "DEX", "CON", "INT", "WIS", "CHA"],
@@ -14619,8 +14666,7 @@ var PFAbilityScores = PFAbilityScores || (function () {
 			updateAbilityScores: updateAbilityScores,
 			applyConditions: applyConditions
 		};
-	}
-	());
+	}());
 var PFMigrate = PFMigrate || (function () {
 	'use strict';
 	/* default repeating_weapon macro texts and iteratives. old = .56, new = .60 */
@@ -15615,8 +15661,7 @@ var PFMigrate = PFMigrate || (function () {
 			migrateNPC: migrateNPC,
 			setAdvancedGridrows:setAdvancedGridrows
 		};
-	}
-	());
+	}());
 var PFDefense = PFDefense || (function () {
 		'use strict';
 		/***********************************DEFENSE PAGE ***********************************/
@@ -15636,7 +15681,7 @@ var PFDefense = PFDefense || (function () {
 			 * Updates the AC-penalty and CMD-penalty field based on conditions
 			 *only difference is CMD penalty affected by energy drain for some reason
 			 */
-			applyConditions = function (eventInfo,callback,silently) {
+			applyConditions = function (callback,silently,eventInfo) {
 				var done = _.once(function () {
 					TAS.debug("leaving PFDefense.applyConditions");
 					if (typeof callback === "function") {
@@ -15693,7 +15738,7 @@ var PFDefense = PFDefense || (function () {
 			 * A creature can also add any circumstance, deflection, dodge, insight, luck, morale, profane, and sacred bonuses to AC to its CMD.
 			 * Any penalties to a creature's AC also apply to its CMD
 			 */
-			updateDefenses = function (eventInfo,callback,silently) {
+			updateDefenses = function (callback,silently) {
 				var done = _.once(function () {
 					TAS.debug("leaving PFDefense.updateDefenses");
 					if (typeof callback === "function") {
@@ -15902,7 +15947,7 @@ var PFDefense = PFDefense || (function () {
 						case "cmd-ability1":
 							PFUtilsAsync.handleDropdown("CMD-ability1", "CMD-STR", function (newv, oldv) {
 								if (newv !== oldv || newv < 0 || oldv < 0) {
-									updateDefenses(null,done,silently);
+									updateDefenses(done,silently);
 								} else {
 									done();
 								}
@@ -15911,7 +15956,7 @@ var PFDefense = PFDefense || (function () {
 						case "ac-ability":
 							PFUtilsAsync.handleDropdown("AC-ability", "AC-ability-mod", function (newv, oldv) {
 								if (newv !== oldv || newv < 0 || oldv < 0) {
-									updateDefenses(null,done,silently);
+									updateDefenses(done,silently);
 								} else {
 									done();
 								}
@@ -15920,7 +15965,7 @@ var PFDefense = PFDefense || (function () {
 						case "cmd-ability2":
 							PFUtilsAsync.handleDropdown("CMD-ability2", "CMD-DEX", function (newv, oldv) {
 								if (newv !== oldv || newv < 0 || oldv < 0) {
-									updateDefenses(null,done,silently);
+									updateDefenses(done,silently);
 								} else {
 									done();
 								}
@@ -16076,13 +16121,13 @@ var PFDefense = PFDefense || (function () {
 				if (oldversion > 0 && oldversion < 0.50 ){
 					PFMigrate.migrateMaxDexAndACP();
 				}
-				applyConditions(null,function(){
+				applyConditions(function(){
 					updateArmor(null,function(){
 						_.each(defenseDropdowns, function (value, key) {
 							handleDefenseDropdown(key,null,true);
 						});
 						//handledefensedropdown already calls updateDefenses between 2 to 5 times!
-						updateDefenses(null,done,true);						
+						updateDefenses(done,silently);						
 					},true);
 				},true);
 			},
@@ -16101,18 +16146,18 @@ var PFDefense = PFDefense || (function () {
 				on(events.defenseEventsAuto, TAS.callback(function eventUpdateDefensesAuto(eventInfo) {
 						TAS.debug("caught " + eventInfo.sourceAttribute + " event: " + eventInfo.sourceType);
 						if (eventInfo.sourceType !== "player") {
-							updateDefenses(eventInfo);
+							updateDefenses(null,null,eventInfo);
 						}
 					}));
 				on(events.defenseEventsPlayer, TAS.callback(function eventUpdateDefensesPlayer(eventInfo) {
 						TAS.debug("caught " + eventInfo.sourceAttribute + " event: " + eventInfo.sourceType);
 						if (eventInfo.sourceType === "player") {
-							updateDefenses(eventInfo);
+							updateDefenses(null,null,eventInfo);
 						}
 					}));
 				on(events.defenseEventsEither, TAS.callback(function eventUpdateDefensesEither(eventInfo) {
 						TAS.debug("caught " + eventInfo.sourceAttribute + " event: " + eventInfo.sourceType);
-						updateDefenses(eventInfo);
+						updateDefenses(null,null,eventInfo);
 					}));
 				on("change:max-dex-source change:acp-source change:current-load", TAS.callback(function eventUpdateArmor(eventInfo) {
 					TAS.debug("caught " + eventInfo.sourceAttribute + " event: " + eventInfo.sourceType);
@@ -16142,8 +16187,7 @@ var PFDefense = PFDefense || (function () {
 			handleDefenseDropdown: handleDefenseDropdown,
 			updateArmor: updateArmor
 		};
-	}
-	());
+	}());
 var PFEncumbrance = PFEncumbrance || (function () {
 		'use strict';
 		var
@@ -16704,8 +16748,7 @@ var PFEncumbrance = PFEncumbrance || (function () {
 			updateLoadsAndLift: updateLoadsAndLift,
 			updateModifiedSpeed: updateModifiedSpeed
 		};
-	}
-	());
+	}());
 var PFInventory = PFInventory || (function () {
 		'use strict';
 		/******ITEMS PAGE ********/
@@ -16940,8 +16983,7 @@ var PFInventory = PFInventory || (function () {
 			updateCarriedCurrency: updateCarriedCurrency,
 			updateCarriedTotal: updateCarriedTotal
 		};
-	}
-	());
+	}());
 var PFAttackGrid = PFAttackGrid || (function () {
 	'use strict';
 	var attackGridFields = {
@@ -17013,7 +17055,7 @@ var PFAttackGrid = PFAttackGrid || (function () {
 			SWUtils.updateRowTotal(["DMG-mod", "buff_DMG-total"], 0, ["condition-Sickened"],false,null,silently);
 		},
 		/* applyConditions- updates the attk-penalty for attacks based on conditions including wearing armor you are not proficient in*/
-		applyConditions = function (eventInfo, callback, silently) {
+		applyConditions = function (callback, silently) {
 			var done = _.once(function () {
 				if (typeof callback === "function") {
 					callback();
@@ -17046,7 +17088,7 @@ var PFAttackGrid = PFAttackGrid || (function () {
 					callback();
 				}
 			};
-			applyConditions(null, function () {
+			applyConditions(function () {
 				_.each(attackGridFields, function (attrMap, attack) {
 					updateAttack(attack);
 				});
@@ -17104,8 +17146,7 @@ var PFAttackGrid = PFAttackGrid || (function () {
 			applyConditions: applyConditions,
 			updateAttack: updateAttack
 		};
-	}
-	());
+	}());
 var PFAttacks = PFAttacks || (function () {
 		'use strict';
 		/***********************************ATTACKS PAGE ***********************************/
@@ -17133,8 +17174,8 @@ var PFAttacks = PFAttacks || (function () {
 			//optionAttrs = ["melee-attack-notes", "ranged-attack-notes", "CMB-notes", "attack-notes", "header_image-pf_attack-melee", "header_image-pf_attack-ranged", "header_image-pf_attack-cmb"],
 			optionToggles = ["toggle_attack_melee_notes", "toggle_attack_ranged_notes", "toggle_attack_CMB_notes", "toggle_attack_attack_notes", "toggle_attack_header_image"],
 			//attackOptionRegex = PFUtils.getOptionsCompiledRegexMap(optionTemplates),
-			repeatingOptionAttrs = ["attack-type", "damage-ability", "damage-dice-num"],
-			repeatingOptionHelperAttrs = ["damage-mod","attack-mod"],
+			repeatingOptionAttrs = ["attack-type", "damage-ability", "damage-dice-num","damage-die","damage","attack"],
+			repeatingOptionHelperAttrs = [""],// ["damage-mod", "attack-mod"],
 			repeatingOptionGetAttrs = repeatingOptionAttrs.concat(repeatingOptionHelperAttrs),
 			getRepeatingAddInMacroPortion = function (macro, toggle, portion) {
 				if (!(macro === "" || macro === "0" || macro === undefined || macro === null || toggle === "" || toggle === "0" || toggle === undefined || toggle === null)) {
@@ -17204,33 +17245,38 @@ var PFAttacks = PFAttacks || (function () {
 			/* getOptionText - resets entire macro options text for a repeating_weapon row */
 			getOptionText = function (id, eventInfo, toggleValues, rowValues) {
 				var prefix = "repeating_weapon_" + PFUtils.getRepeatingIDStr(id),
-					attackType = PFUtils.findAbilityInString(rowValues[prefix + "attack-type"]),
-					damageAbility = PFUtils.findAbilityInString(rowValues[prefix + "damage-ability"]),
-					optionText = "",
-					newValue = "";
-				TAS.debug("PFAttacks.getOptionText: attacktype "+attackType+", damageAbility:"+damageAbility+", prefix:"+prefix+", all:",rowValues);
-				if (!attackType || !damageAbility){
-					TAS.debug("THIS ONE SHOULD HAVE BLANKS");
+				attackType = PFUtils.findAbilityInString(rowValues[prefix + "attack-type"]),
+				damageAbility = PFUtils.findAbilityInString(rowValues[prefix + "damage-ability"]),
+				optionText = "";
+				TAS.debug("PFAttackOptions.getOptionText: attacktype " + attackType + ", damageAbility:" + damageAbility + ", prefix:" + prefix + ", all:", rowValues);
+				if (!attackType || !damageAbility) {
+					TAS.debug("THIS ONE SHOULD HAVE BLANKS rowid:"+id);
 				}
-				if (attackType) {
-					attackType = attackType.replace('attk-', '').replace('2', '');
+				if (attackType || (rowValues[prefix + "attack"] && rowValues[prefix + "attack"] !== "0")) {
+					if (attackType){
+						attackType = attackType.replace('attk-', '').replace('2', '');
+					}
 					if ((attackType === "melee" && toggleValues.showmelee) || (attackType === "ranged" && toggleValues.showranged) || (attackType === "CMB" && toggleValues.showcmb)) {
 						optionText += optionTemplates[attackType + "_notes"].replace("REPLACE", optionDefaults.notes[attackType]);
 					}
 					if (toggleValues.showheader_image) {
 						optionText += optionTemplates.header_image.replace("REPLACE", optionDefaults.image[attackType]);
 					}
+					optionText+= "{{no_attack_roll=}}";
 				} else if (!parseInt(rowValues[prefix + "attack-mod"], 10)) {
 					optionText += "{{no_attack_roll=1}}";
 				}
-				if (!(damageAbility || parseInt(rowValues[prefix + "damage-dice-num"], 10) ||
-					parseInt(rowValues[prefix + "damage-mod"], 10)) ) {
+				if (!(damageAbility || (rowValues[prefix + "damage"] && rowValues[prefix + "damage"] !== "0") || 
+					(parseInt(rowValues[prefix + "damage-dice-num"], 10) && parseInt(rowValues[prefix + "damage-die"], 10))
+					)) {
 					optionText += "{{no_damage=1}}";
+				} else {
+					optionText += "{{no_damage=}}";
 				}
 				if (toggleValues.showattack) {
 					optionText += optionTemplates.attack_notes.replace("REPLACE", optionDefaults.notes.attack);
 				}
-				TAS.debug("getOptionText, returning :"+optionText);
+				TAS.debug("getOptionText, returning :" + optionText);
 				return optionText;
 			},
 			/* resets one row of repeating_weapons
@@ -17380,6 +17426,7 @@ var PFAttacks = PFAttacks || (function () {
 					enhanceField = "repeating_weapon_" + idStr + "enhance",
 					miscDmgField = "repeating_weapon_" + idStr + "damage-mod",
 					abilityMultField = "repeating_weapon_" + idStr + "damage_ability_mult";
+				TAS.debug("PFAttacks.updateRepeatingWeaponDamage:"+id);
 				getAttrs([maxname, modname, "DMG-mod", totalDamageField, enhanceField, miscDmgField, abilityMultField], function (v) {
 					var maxA = Math.abs(parseInt(v[maxname], 10) || 9999),
 						ability = parseInt(v[modname], 10) || 0,
@@ -17391,11 +17438,12 @@ var PFAttacks = PFAttacks || (function () {
 						enhance = parseInt(v[enhanceField], 10) || 0,
 						totalDamage = abilityTot + globalBuffConds + miscDmg + enhance,
 						setter = {};
+					TAS.debug("");
 					if (totalDamage !== currTotalDmg || isNaN(currTotalDmg)) {
 						setter[totalDamageField] = totalDamage;
 					}
 					if (_.size(setter)) {
-						setAttrs(setter, {silent: true},resetOptionsWhenDone);
+						setAttrs(setter, {},resetOptionsWhenDone);
 					}
 				});
 			},
@@ -17477,6 +17525,7 @@ var PFAttacks = PFAttacks || (function () {
 			},
 			/* updateRepeatingWeaponDamages - updates all attacks when DMG-mod changes */
 			updateRepeatingWeaponDamages = function (eventInfo) {
+				TAS.debug("PFAttacks.updateRepeatingWeaponDamages");
 				getSectionIDs("repeating_weapon", function (ids) {
 					_.each(ids, function (id) {
 						updateRepeatingWeaponDamage(id,eventInfo);
@@ -17763,8 +17812,8 @@ var PFAttacks = PFAttacks || (function () {
 					}
 				}));
 				on("change:dmg-mod", TAS.callback(function eventUpdateRepeatingWeaponDamageTotal(eventInfo) {
+					TAS.debug("caught " + eventInfo.sourceAttribute + " event: " + eventInfo.sourceType);
 					if (eventInfo.sourceType !== "player") {
-						TAS.debug("caught " + eventInfo.sourceAttribute + " event: " + eventInfo.sourceType);
 						updateRepeatingWeaponDamages(eventInfo);
 					}
 				}));
@@ -17789,8 +17838,7 @@ var PFAttacks = PFAttacks || (function () {
 			updateRepeatingWeaponDamages: updateRepeatingWeaponDamages,
 			updateRepeatingWeaponsFromCrit: updateRepeatingWeaponsFromCrit
 		};
-	}
-	());
+	}());
 var PFSpells = PFSpells || (function () {
 		'use strict';
 		//the 3 spell classes at top of spells page
@@ -19748,8 +19796,7 @@ var PFSpells = PFSpells || (function () {
 			updateSpellsCasterAbilityRelated: updateSpellsCasterAbilityRelated,
 			updateSpellsCasterLevelRelated: updateSpellsCasterLevelRelated
 		};
-	}
-	());
+	}());
 var PFClassRaceGrid = PFClassRaceGrid || (function () {
 		'use strict';
 		var classColumns = ["hp", "fchp", "skill", "fcskill", "fcalt", "bab", "Fort", "Ref", "Will", "level"],
@@ -19880,8 +19927,7 @@ var PFClassRaceGrid = PFClassRaceGrid || (function () {
 			classRows: classRows,
 			updateClassInformation: updateClassInformation
 		};
-	}
-	());
+	}());
 var PFSkills = PFSkills || (function () {
 		'use strict';
 		var regularCoreSkills = ["Appraise", "Acrobatics", "Bluff", "Climb", "Diplomacy", "Disable-Device", "Disguise", "Escape-Artist", "Fly", "Handle-Animal", "Heal", "Intimidate", "Linguistics", "Perception", "Ride", "Sense-Motive", "Sleight-of-Hand", "Spellcraft", "Stealth", "Survival", "Swim", "Use-Magic-Device"],
@@ -19931,6 +19977,7 @@ var PFSkills = PFSkills || (function () {
 			backgroundSkills = backgroundCoreSkills.concat(backgroundOnlySkills).sort(),
 			allCoreSkills = adventureSkills.concat(backgroundCoreSkills).sort(),
 			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"],
+			allTheSkills = regularAdventureSkills.concat(knowledgeSkills).concat(backgroundCoreSkills).concat(backgroundOnlySkills).concat(consolidatedSkills).concat(allFillInSkillInstances).sort(),
 			coreSkillAbilityDefaults = {
 				"Acrobatics": "dex",
 				"Appraise": "int",
@@ -20233,30 +20280,29 @@ var PFSkills = PFSkills || (function () {
 							fields = fields.concat([skill + "-name", skill + "-ranks"]);
 						}
 						getAttrs(fields, function (v) {
-							var retval = false;
-							if (!isSub || v[skill + "-name"] || v[skill+"-ranks"]) {
+							var retval = false,
+							usesBG=parseInt(v["BG-Skill-Use"],10)||0,
+							usesUnchained=parseInt(v["unchained_skills-show"],10)||0;
+							if (!isSub || v[skill + "-name"] || (parseInt(v[skill+"-ranks"],10)||0)>0) {
 								if (core) {
-									if (v["unchained_skills-show"] == "0" || v["BG-Skill-Use"] == "1") {
+									if (!usesUnchained || usesBG) {
 										retval = true;
 									}
 								} else if (bg) {
-									if (v["unchained_skills-show"] == "1" && v["BG-Skill-Use"] == "1") {
+									if (usesUnchained && usesBG) {
 										retval = true;
 									}
 								} else {
-									if (v["unchained_skills-show"] == "1" && v["BG-Skill-Use"] == "0") {
+									if (usesUnchained && !usesBG) {
 										retval = true;
 									}
 								}
 							}
-							if ((/craft/i).test(skill)){
-								TAS.debug("PFSkills.verifyHasSkill returning "+retval+" for skill "+skill);
-							}
 							callback(retval);
 						});
 					}
 				} catch (err) {
-					TAS.error("PFSkill.verifyHasSkill", err);
+					TAS.error("PFSkills.verifyHasSkill", err);
 					callback(false);
 				}
 			},
@@ -20351,7 +20397,7 @@ var PFSkills = PFSkills || (function () {
 						if (currSkill !== skillTot) {
 							setter[skill] = skillTot;
 						}
-						if ((v[classNm] || "0/0/0/0") !== mods) {
+						if (v[classNm]  !== mods) {
 							setter[classNm] = mods;
 						}
 					} catch (err) {
@@ -20660,23 +20706,20 @@ var PFSkills = PFSkills || (function () {
 									temparray = [];
 								if (background) {
 									canshowarray = assembleSkillButtonArray(regularBackgroundSkills, rt, v) || [];
-									temparray=temparray.concat(canshowarray).concat(skillsWithSubSkills);
-									canshowarray=canshowarray.sort();
+									temparray=temparray.concat(canshowarray);
+									canshowarray=canshowarray.concat(skillsWithSubSkills).sort();
 									tempRTMacro = baseGenMacro + getSkillButtonMacro("background-skills", canshowarray, showBonus);
 									if (bgv["background_skills-macro"] != tempRTMacro) {
 										setter["background_skills-macro"] = tempRTMacro;
 									}
 									canshowarray = assembleSkillButtonArray(regularAdventureSkills, rt, v) || [];
-									temparray=temparray.concat(canshowarray);
-									temparray=temparray.concat(canshowarray).concat(["Knowledge"]);
-									canshowarray=canshowarray.sort();									
-									//temparray = temparray.concat(canshowarray);canshowarray = canshowarray.concat(["Knowledge"]).sort();
+									temparray = temparray.concat(canshowarray);
+									canshowarray = canshowarray.concat(["Knowledge","Misc-Skill"]).sort();
 									tempRTMacro = baseGenMacro + getSkillButtonMacro("adventure-skills", canshowarray, showBonus);
 									if (bgv["adventure_skills-macro"] != tempRTMacro) {
 										setter["adventure_skills-macro"] = tempRTMacro;
 									}
-									temparray=temparray.concat(skillsWithSubSkills);//temparray = temparray.concat(skillsWithSubSkills);
-									temparray = temparray.sort();
+									temparray = temparray.concat(skillsWithSubSkills).sort();
 									tempRTMacro = baseGenMacro + getSkillButtonMacro("skills", temparray, showBonus);
 									setter[skillPrefix + "skills-macro"] = baseGenMacro + tempRTMacro;
 									if (bgv["skills-macro"] != tempRTMacro) {
@@ -20745,6 +20788,18 @@ var PFSkills = PFSkills || (function () {
 					}
 				});
 			},
+			applyConditions = function (callback,silently,eventInfo){
+				TAS.notice("at apply conditions");
+				_.each(allTheSkills, function (skill) {
+					verifyHasSkill(skill, function (hasSkill) {
+						if (hasSkill) {
+							updateSkill(skill, eventInfo);
+						} else {
+							TAS.debug("does not use skill: "+skill);
+						}
+					});
+				});
+			},
 			/* recalculate - updates ALL skills  - calls PFUtilsAsync.handleDropdown for ability then updateSkill */
 			recalculate = function (callback, silently, oldversion) {
 				var done = _.once(function () {
@@ -20763,7 +20818,8 @@ var PFSkills = PFSkills || (function () {
 				}, silently, oldversion);
 			},
 			events = {
-				skillEventsAuto: "change:acp change:checks-cond change:phys-skills-cond change:REPLACE-ability-mod change:REPLACE-misc-mod",
+				skillGlobalEventAuto: "change:checks-cond change:phys-skills-cond change:acp",
+				skillEventsAuto: "change:REPLACE-ability-mod change:REPLACE-misc-mod",
 				skillEventsPlayer: "change:REPLACE-cs change:REPLACE-ranks change:REPLACE-racial change:REPLACE-feat change:REPLACE-item change:REPLACE-ReqTrain"
 			},
 			registerEventHandlers = function () {
@@ -20774,16 +20830,37 @@ var PFSkills = PFSkills || (function () {
 						updateMaxSkills(eventInfo);
 					}
 				}));
+				on("change:checks-cond", TAS.callback(function eventChecksCond(eventInfo) {
+					TAS.debug("caught " + eventInfo.sourceAttribute + " event for " + eventInfo.sourceType);
+					if (eventInfo.sourceType !== "player") {
+						applyConditions(null,null,eventInfo);
+					}
+				}));				
+				on("change:phys-skills-cond", TAS.callback(function eventPhysSkills(eventInfo) {
+					TAS.debug("caught " + eventInfo.sourceAttribute + " event for " + eventInfo.sourceType);
+					if (eventInfo.sourceType !== "player") {
+						applyConditions(null,null,eventInfo);
+					}
+				}));
+				on("change:acp", TAS.callback(function eventACP(eventInfo) {
+					TAS.debug("caught " + eventInfo.sourceAttribute + " event for " + eventInfo.sourceType);
+					if (eventInfo.sourceType !== "player") {
+						applyConditions(null,null,eventInfo);
+					}
+				}));
+				on("change:checks-cond change:phys-skills-cond change:acp",function(){applyConditions();});
 				//each skill has a dropdown handler and a skill update handler
 				//concat them all up, only happens once so no big deal
-				_.each(allCoreSkills.concat(backgroundOnlySkills).concat(consolidatedSkills).concat(allFillInSkillInstances), function (skill) {
+				_.each(allTheSkills, function (skill) {
 					on((events.skillEventsAuto.replace(/REPLACE/g, skill)), TAS.callback(function eventSkillsAuto(eventInfo) {
 						TAS.debug("caught " + eventInfo.sourceAttribute + " event for " + skill + ", " + eventInfo.sourceType);
-						verifyHasSkill(skill, function (hasSkill) {
-							if (eventInfo.sourceType !== "player") {
-								updateSkill(skill, eventInfo);
-							}
-						});
+						if (eventInfo.sourceType !== "player") {
+							verifyHasSkill(skill, function (hasSkill) {
+								if (hasSkill) {
+									updateSkill(skill, eventInfo);
+								}
+							});
+						}
 					}));
 					on((events.skillEventsPlayer.replace(/REPLACE/g, skill)), TAS.callback(function eventSkillsPlayer(eventInfo) {
 						TAS.debug("caught " + eventInfo.sourceAttribute + " event for " + skill + ", " + eventInfo.sourceType);
@@ -20888,6 +20965,7 @@ var PFSkills = PFSkills || (function () {
 			events: events,
 			recalculate: recalculate,
 			migrate: migrate,
+			applyConditions:applyConditions,
 			backgroundOnlySkills: backgroundOnlySkills,
 			allCoreSkills: allCoreSkills,
 			skillsWithSpaces: skillsWithSpaces,
@@ -20905,8 +20983,7 @@ var PFSkills = PFSkills || (function () {
 			updateSubSkillMacroBook: updateSubSkillMacroBook,
 			verifyHasSkill: verifyHasSkill
 		};
-	}
-	());
+	}());
 var PFFeatures = PFFeatures || (function () {
 		'use strict';
 		var
@@ -21005,6 +21082,7 @@ var PFFeatures = PFFeatures || (function () {
 					});
 				} catch (err) {
 					TAS.error("PFFeatures.recalculate, error calling recalculateRepeatingMaxUsed", err);
+				} finally {
 					done();
 				}
 			},
@@ -21027,8 +21105,7 @@ var PFFeatures = PFFeatures || (function () {
 			createFeatEntries: createFeatEntries,
 			createFeatureEntries: createFeatureEntries
 		};
-	}
-	());
+	}());
 var PFPsionic = PFPsionic || (function () {
 		'use strict';
 		var
@@ -21115,8 +21192,7 @@ var PFPsionic = PFPsionic || (function () {
 			recalculate: recalculate,
 			updatePsionicBonusPower: updatePsionicBonusPower
 		};
-	}
-	());
+	}());
 var PFMythic = PFMythic || (function () {
 		'use strict';
 		var
@@ -21176,7 +21252,7 @@ var PFMythic = PFMythic || (function () {
 							setter["tier-mythic-power"] = totalTier;
 						}
 					} catch (err) {
-						TAS.error("PFFeatures.updateTierMythicPower error", err);
+						TAS.error("PFMythic.updateTierMythicPower error", err);
 					} finally {
 						if (_.size(setter) > 0) {
 							if (silently) {
@@ -21241,8 +21317,7 @@ var PFMythic = PFMythic || (function () {
 			updateTierMythicPower: updateTierMythicPower,
 			updateMythicPathHP: updateMythicPathHP
 		};
-	}
-	());
+	}());
 var PFHealth = PFHealth || (function () {
 		'use strict';
 		/*setWoundLevel sets would level based on current HP when you already have all fields.
@@ -21408,7 +21483,7 @@ var PFHealth = PFHealth || (function () {
 			/* updateTempMaxHP
 			 * sets temp hp
 			 */
-			updateTempMaxHP = function (forceReset, callback, silently) {
+			updateTempMaxHP = function (callback, silently,eventInfo,forceReset) {
 				var done = _.once(function () {
 					if (typeof callback === "function") {
 						callback();
@@ -21523,8 +21598,7 @@ var PFHealth = PFHealth || (function () {
 			updateMaxHPLookup: updateMaxHPLookup,
 			updateTempMaxHP: updateTempMaxHP
 		};
-	}
-	());
+	}());
 var PFSaves = PFSaves || (function () {
 		'use strict';
 		var saveTypes = ["Fort", "Ref", "Will"],
@@ -21635,8 +21709,7 @@ var PFSaves = PFSaves || (function () {
 			applyConditions: applyConditions,
 			updateSave: updateSave
 		};
-	}
-	());
+	}());
 var PFSize = PFSize || (function () {
 		'use strict';
 		var
@@ -21748,8 +21821,7 @@ var PFSize = PFSize || (function () {
 			handleSizeChange: handleSizeChange,
 			updateSize: updateSize
 		};
-	}
-	());
+	}());
 var PFInitiative = PFInitiative || (function () {
 	'use strict';
 	/* updateInitiative * updates the init*/
@@ -21787,42 +21859,46 @@ var PFInitiative = PFInitiative || (function () {
 		recalculate: recalculate,
 		updateInitiative: updateInitiative
 	};
-}
-	());
+}());
 var PFChecks = PFChecks || (function () {
 		'use strict';
-		var
-		/* PFChecks.applyConditions - handles changes to skill and ability checks due to conditions AND buffs.
-		 * Reads in condition that affect Ability and Skill checks and updates condition fields.
-		 * checks-cond, Phys-skills-cond, Perception-cond.
+		/** PFChecks.applyConditions - handles changes to skill and ability checks due to conditions AND buffs.
+		 * Reads in condition that affect Ability and Skill checks and updates condition fields. checks-cond, Phys-skills-cond, Perception-cond.
+		 *@param {function} callback callback function 
+		 *@param {bool} silently if true if pass {silent:true} to setAttrs
 		 */
-			applyConditions = function (callback, silently) {
+		var applyConditions = function (callback, silently) {
 			var done = function () {
 				if (typeof callback === "function") {
 					callback();
 				}
 			};
 			getAttrs(["condition-Blinded", "condition-Fear", "condition-Drained", "condition-Sickened", "condition-Wounds", "has_endurance_feat", "wounds_gritty_mode", "checks-cond", "Phys-skills-cond", "Perception-cond", "buff_Check-total", "wound_threshold-show", "CasterLevel-Penalty"], function (v) {
+				//TAS.debug("At PFChecks.applyConditions, silently: "+silently,v);
 				//there is no Fascinated, if we add it then:
 				//,"condition-Fascinated" -4 to perception
 				var setter = {},
-					params = {};
+					params = {},
+					buffCheck=0,drained=0,fear=0,sick=0,woundPenalty=0,wounds=0,allSkillsMod=0,casterlevel=0,blindedMod=0,
+					currAllSkills=0,currPhysSkills=0,currPerSkills=0,currCaster=0;
 				try {
-					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),
-						woundPenalty = PFUtils.getWoundPenalty((parseInt(v["condition-Wounds"], 10) || 0), (parseInt(v.has_endurance_feat, 10) || 0), (parseInt(v.wounds_gritty_mode, 10) || 0)),
-						wounds = (parseInt(v["wound_threshold-show"], 10) || 0) * woundPenalty,
-						allSkillsMod = buffCheck + drained + fear + sick + wounds,
-						casterlevel = drained + wounds,
-						blindedMod = -2 * (parseInt(v["condition-Blinded"], 10) || 0),
-						currAllSkills = parseInt(v["checks-cond"], 10) || 0,
-						currPhysSkills = parseInt(v["Phys-skills-cond"], 10) || 0,
-						currPerSkills = parseInt(v["Perception-cond"], 10) || 0,
-						currCaster = parseInt(v["CasterLevel-Penalty"], 10) || 0;
+					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);
+					woundPenalty = PFUtils.getWoundPenalty((parseInt(v["condition-Wounds"], 10) || 0), (parseInt(v.has_endurance_feat, 10) || 0), (parseInt(v.wounds_gritty_mode, 10) || 0));
+					wounds = (parseInt(v["wound_threshold-show"], 10) || 0) * woundPenalty;
+					allSkillsMod = buffCheck + drained + fear + sick + wounds;
+					casterlevel = drained + wounds;
+					blindedMod = -2 * (parseInt(v["condition-Blinded"], 10) || 0);
+					currAllSkills = parseInt(v["checks-cond"], 10) || 0;
+					currPhysSkills = parseInt(v["Phys-skills-cond"], 10) || 0;
+					currPerSkills = parseInt(v["Perception-cond"], 10) || 0;
+					currCaster = parseInt(v["CasterLevel-Penalty"], 10) || 0;
+					TAS.debug("buffCheck is "+buffCheck+", new skillsmod:"+allSkillsMod+", curr checks-cond:"+currAllSkills);
 					if (allSkillsMod !== currAllSkills || isNaN(currAllSkills)) {
-						setter["checks-cond"] = allSkillsMod;
+						setter["checks-cond"]=allSkillsMod;
+						TAS.debug("set checks-cond to:"+ allSkillsMod);
 					}
 					if (blindedMod !== currPhysSkills || isNaN(currPhysSkills)) {
 						setter["Phys-skills-cond"] = blindedMod;
@@ -21840,6 +21916,8 @@ var PFChecks = PFChecks || (function () {
 						if (silently) {
 							params.silent = true;
 						}
+						TAS.debug("PFChecks params is: ",params);
+						TAS.debug("PFChecks.applyConditions, setting  ",setter);
 						setAttrs(setter, params, done);
 					} else {
 						done();
@@ -21852,8 +21930,7 @@ var PFChecks = PFChecks || (function () {
 		return {
 			applyConditions: applyConditions
 		};
-	}
-	());
+	}());
 var PFConditions = PFConditions || (function () {
 		'use strict';
 		var
@@ -21942,7 +22019,7 @@ var PFConditions = PFConditions || (function () {
 						on(eventToWatch, TAS.callback(function eventConditionEventsPlayer(eventInfo) {
 							TAS.debug("caught " + eventInfo.sourceAttribute + " event: " + eventInfo.sourceType);
 							if (eventInfo.sourceType === "player") {
-								methodToCall(eventInfo);
+								methodToCall(null,null,eventInfo);
 							}
 						}));
 					});
@@ -21951,14 +22028,19 @@ var PFConditions = PFConditions || (function () {
 					_.each(functions, function (methodToCall) {
 						on(eventToWatch, TAS.callback(function eventConditionEventsEither(eventInfo) {
 							TAS.debug("caught " + eventInfo.sourceAttribute + " event: " + eventInfo.sourceType);
-							methodToCall(eventInfo);
+							methodToCall(null,null,eventInfo);
 						}));
 					});
 				});
 				on("change:Perception-cond", TAS.callback(function eventUpdateSkillPerceptionCond(eventInfo) {
 					TAS.debug("caught " + eventInfo.sourceAttribute + " event: " + eventInfo.sourceType);
-					PFSkills.updateSkill("Perception", eventInfo);
-					PFSkills.updateSkill("CS-Perception", eventInfo);
+					PFSkills.verifyHasSkill("Perception",function(hasSkill){
+						if (hasSkill){
+							PFSkills.updateSkill("Perception", eventInfo);
+						} else {
+							PFSkills.updateSkill("CS-Perception", eventInfo);
+						}
+					});
 				}));
 			};
 		registerEventHandlers();
@@ -21972,15 +22054,12 @@ var PFConditions = PFConditions || (function () {
 			events: events,
 			registerEventHandlers: registerEventHandlers
 		};
-	}
-	());
+	}());
 var PFBuffs = PFBuffs || (function () {
 		'use strict';
 		var buffColumns = PFAbilityScores.abilities.concat(["Ranged", "Melee", "DMG", "AC", "Touch", "CMD", "HP-temp", "Fort", "Will", "Ref", "Check", "CasterLevel"]),
-			//why did i make this? it just repeats the ability scores
-			allBuffColumns = buffColumns, //buffColumns.concat(PFAbilityScores.abilities),
-			/* this is so old no one will be using it*/
-			migrate = function (outerCallback, silently) {
+		/* this is so old no one will be using it*/
+		migrate = function (outerCallback, silently) {
 				var done = _.once(function () {
 					TAS.debug("leaving PFBuffs.migrate");
 					if (typeof outerCallback === "function") {
@@ -22009,316 +22088,335 @@ var PFBuffs = PFBuffs || (function () {
 					}
 				});
 			},
-			/* createTotalBuffEntry - adds enabled buff for a new sheet where this is the only buff so sets total as well.
-			 * adds attributes to array passed in
-			 * @newRowAttrs - object of {name:value} (setter in other functions)
-			 */
-			createTotalBuffEntry = function (name, bufftype, buffmacro, modamount, newRowAttrs) {
-				var newRowId = generateRowID();
-				newRowAttrs["repeating_buff_" + newRowId + "_buff-name"] = name;
-				newRowAttrs["repeating_buff_" + newRowId + "_buff-" + bufftype + "_macro-text"] = buffmacro;
-				newRowAttrs["repeating_buff_" + newRowId + "_buff-" + bufftype] = modamount;
-				newRowAttrs["repeating_buff_" + newRowId + "_buff-" + bufftype + "-show"] = "1";
-				newRowAttrs["repeating_buff_" + newRowId + "_buff-enable_toggle"] = "1";
-				newRowAttrs["buff_" + bufftype + "-total"] = modamount;
-				return newRowAttrs;
-			},
-			resetStatuspanel = function(callback){
-				var done = _.once(function(){if (typeof callback === "function"){callback();}}),
-				buffTotalsColumns,fields;
-				try {
-					buffTotalsColumns=_.extend( 
-						_.map(allBuffColumns,function(col){
-							return "buff_"+col+"-total";
-						}),
-						_.map(PFAbilityScores.abilities,function(col){
-							return "buff_"+col+"-total_penalty";
-						})
-					);
-					fields = SWUtils.cartesianAppend(["buff_"],buffColumns,["-total","_exists"]).concat(
-						SWUtils.cartesianAppend(["buff_"],PFAbilityScores.abilities,["-total","-total_penalty","_exists","_penalty_exists"])
-					);
-					getAttrs(fields,function(v){
-						var setter={};
-						try {
-							setter= _.reduce(allBuffColumns,function(memo,col){
-									var val,field,exists;
-									try{
-										val=parseInt(v["buff_"+col+"-total"],10)||0; field = "buff_"+col+"_exists"; exists = parseInt(v[field],10)||0;
-										if (val !== 0 && !exists) {
-											memo[field] = "1";
-										} else if (val === 0 && exists) {
-											memo[field] = "";
-										}
-									}catch (erri1){
-									} finally {
-										return memo;
-									}
-								},setter);
-							setter= _.reduce(PFAbilityScores.abilities,function(memo,col){
-									var val,field,exists;
-									try{
-										val=parseInt(v["buff_"+col+"-total_penalty"],10)||0; field = "buff_"+col+"_penalty_exists"; exists = parseInt(v[field],10)||0;
-										if (val !== 0 && !exists) {
-											memo[field] = "1";
-										} else if (val === 0 && exists) {
-											memo[field] = "";
-										}						
-									}catch (erri1){
-									} finally {
-										return memo;
-									}
-								},setter);
-						} catch (err){
-							TAS.error("PFBuffs.resetStatuspanel error inside calculate exists",err);
-						} finally {
-							if (_.size(setter)>0){
-								setAttrs(setter,{silent:true},done);
-							} else {
-								done();
-							}
-						}
-					});
-				} catch (errO){
-					TAS.error("PFBuffs.resetStatuspanel error creating field array, abort:",errO);
-					done();
-				}
-			},
-			/* Sets 1 or 0 for buffexists in status panel - only called by updateBuffTotals. */
-			toggleBuffStatusPanel = function (col, val) {
-				var field = "buff_" + col + "_exists";
-				//TAS.debug("looking at "+field);
-				getAttrs([field], function (v) {
-					var setter = {};
+		/** createTotalBuffEntry - used by parseNPC
+		 * adds enabled buff for a new sheet where this is the only buff so sets total as well.
+		 * adds attributes to array passed in
+		 * @param {string} name name of buff row  for buff-name
+		 * @param {string} bufftype  -string from buffColumns
+		 * @param {number} modamount - value for the buff
+		 * @param {jsobjectmap} newRowAttrs - object of {name:value} to pass to setAttrs
+		 * @return {jsobjectmap} return newRowAttrs after adding maps to it.
+		 */
+		createTotalBuffEntry = function (name, bufftype, buffmacro, modamount, newRowAttrs) {
+			var newRowId = generateRowID();
+			newRowAttrs = newRowAttrs||{};
+			newRowAttrs["repeating_buff_" + newRowId + "_buff-name"] = name;
+			newRowAttrs["repeating_buff_" + newRowId + "_buff-" + bufftype + "_macro-text"] = buffmacro;
+			newRowAttrs["repeating_buff_" + newRowId + "_buff-" + bufftype] = modamount;
+			newRowAttrs["repeating_buff_" + newRowId + "_buff-" + bufftype + "-show"] = "1";
+			newRowAttrs["repeating_buff_" + newRowId + "_buff-enable_toggle"] = "1";
+			newRowAttrs["buff_" + bufftype + "-total"] = modamount;
+			return newRowAttrs;
+		},
+		resetStatuspanel = function(callback){
+			var done = _.once(function(){if (typeof callback === "function"){callback();}}),
+			buffTotalsColumns,fields;
+			try {
+				buffTotalsColumns=_.extend( 
+					_.map(buffColumns,function(col){
+						return "buff_"+col+"-total";
+					}),
+					_.map(PFAbilityScores.abilities,function(col){
+						return "buff_"+col+"-total_penalty";
+					})
+				);
+				fields = SWUtils.cartesianAppend(["buff_"],buffColumns,["-total","_exists"]).concat(
+					SWUtils.cartesianAppend(["buff_"],PFAbilityScores.abilities,["-total","-total_penalty","_exists","_penalty_exists"])
+				);
+				getAttrs(fields,function(v){
+					var setter={};
 					try {
-						//TAS.debug("comparing value:"+ val+" and fieldvalue of "+field+" which is "+ v[field]);
-						if (val !== 0 && v[field] != "1") {
-							setter[field] = "1";
-						} else if (val === 0 && v[field] == "1") {
-							setter[field] = "";
-						}
-					} catch (err) {
-						TAS.error("PFBuffs.toggleBuffStatusPanel", err);
+						setter= _.reduce(buffColumns,function(memo,col){
+								var val,field,exists;
+								try{
+									val=parseInt(v["buff_"+col+"-total"],10)||0; field = "buff_"+col+"_exists"; exists = parseInt(v[field],10)||0;
+									if (val !== 0 && !exists) {
+										memo[field] = "1";
+									} else if (val === 0 && exists) {
+										memo[field] = "";
+									}
+								}catch (erri1){
+								} finally {
+									return memo;
+								}
+							},setter);
+						setter= _.reduce(PFAbilityScores.abilities,function(memo,col){
+								var val,field,exists;
+								try{
+									val=parseInt(v["buff_"+col+"-total_penalty"],10)||0; field = "buff_"+col+"_penalty_exists"; exists = parseInt(v[field],10)||0;
+									if (val !== 0 && !exists) {
+										memo[field] = "1";
+									} else if (val === 0 && exists) {
+										memo[field] = "";
+									}						
+								}catch (erri1){
+								} finally {
+									return memo;
+								}
+							},setter);
+					} catch (err){
+						TAS.error("PFBuffs.resetStatuspanel error inside calculate exists",err);
 					} finally {
 						if (_.size(setter)>0){
-							setAttrs(setter, {silent: true});
+							setAttrs(setter,{silent:true},done);
+						} else {
+							done();
 						}
 					}
 				});
-			},
-			setBuff = function (id, col, callback, silently) {
-				var done = function () {
-						if (typeof callback === "function") {
-							callback();
-						}
-					},
-					idStr = PFUtils.getRepeatingIDStr(id),
-					prefix = "repeating_buff_" + idStr + "buff-" + col,
-					//highlight error flag if they set ability buff to a negative number
-					setNegativeAbilityBuff = function (newval, oldval, changed) {
-						var toggleErr = prefix + "_error";
-						try {
-							if (PFAbilityScores.abilities.indexOf(col) >= 0) {
-								getAttrs([toggleErr], function (v) {
-									var setter = {};
-									if (newval < 0 && v[toggleErr] != "1") {
-										setter[toggleErr] = "1";
-										setAttrs(setter, {
-											silent: true
-										});
-									} else if (newval >= 0 && v[toggleErr] != "0") {
-										setter[toggleErr] = "0";
-										setAttrs(setter, {
-											silent: true
-										});
-									}
-								});
-							}
-						} catch (err) {
-							TAS.error("PFBUffs.setBuff:" + col + " for row " + id, err);
-						} finally {
-							done();
-						}
-					};
-				SWUtils.evaluateAndSetNumber(prefix + "_macro-text", prefix, 0, setNegativeAbilityBuff, silently);
-			},
-			updateBuffTotals = function (col, callback) {
-				var done = _.once(function () {
+			} catch (errO){
+				TAS.error("PFBuffs.resetStatuspanel error creating field array, abort:",errO);
+				done();
+			}
+		},
+		/* Sets 1 or 0 for buffexists in status panel - only called by updateBuffTotals. */
+		toggleBuffStatusPanel = function (col, val) {
+			var field = "buff_" + col + "_exists";
+			//TAS.debug("looking at "+field);
+			getAttrs([field], function (v) {
+				var setter = {};
+				try {
+					//TAS.debug("comparing value:"+ val+" and fieldvalue of "+field+" which is "+ v[field]);
+					if (val !== 0 && v[field] != "1") {
+						setter[field] = "1";
+					} else if (val === 0 && v[field] == "1") {
+						setter[field] = "";
+					}
+				} catch (err) {
+					TAS.error("PFBuffs.toggleBuffStatusPanel", err);
+				} finally {
+					if (_.size(setter)>0){
+						setAttrs(setter, {silent: true});
+					}
+				}
+			});
+		},
+		setBuff = function (id, col, callback, silently) {
+			var done = function () {
 					if (typeof callback === "function") {
 						callback();
 					}
-				}),
-				isAbility  =(PFAbilityScores.abilities.indexOf(col) >= 0);
-				try {
-					TAS.repeating('buff').attrs('buff_' + col + '-total','buff_' + col + '-total_penalty').fields('buff-' + col, 'buff-enable_toggle', 'buff-' + col + '-show').reduce(function (m, r) {
-						try {
-							var tempM = (r.I['buff-' + col] * (r.I['buff-enable_toggle'] & r.I['buff-' + col + '-show']));
-							if(!(isAbility&&tempM<0)){
-								m.mod += tempM;
-							} else {
-								m.pen += tempM;
-							}
-						} catch (err) {
-							TAS.error("PFBuffs.updateBuffTotals error:" + col, err);
-						} finally {
-							return m;
-						}
-					}, {
-						mod: 0,
-						pen: 0
-					}, function (m, r, a) {
-						a.S['buff_' + col + '-total'] = m.mod;
-						toggleBuffStatusPanel(col, m.mod);
-						if (isAbility){
-							a.S['buff_' + col + '-total_penalty'] = m.pen;
-							TAS.debug("now also check ability penalty status");
-							toggleBuffStatusPanel(col+"_penalty", m.pen);
-						}
-					}).execute(done);
-				} catch (err2) {
-					TAS.error("PFBuffs.updateBuffTotals error:" + col, err2);
-					done();
-				}
-			},
-			recalculate = function (callback, silently, oldversion) {
-				var done = _.once(function () {
-						resetStatuspanel(function(){
-							TAS.debug("Leaving PFBuffs.recalculate");
-							if (typeof callback === "function") {
-								callback();
-							}
-						});
-					}),
-					numColumns = _.size(allBuffColumns),
-					columnDone = _.after(numColumns, done),
-					recalculateBuffColumn = function (ids, col) {
-						var rowtotal = _.size(ids),
-							totalItUp = _.once(function () {
-								updateBuffTotals(col, columnDone);
-							}),
-							rowDone = _.after(rowtotal, function () {
-								totalItUp();
-							});
-						try {
-							_.each(ids, function (id) {
-								try {
-									setBuff(id, col, rowDone, silently);
-								} catch (err) {
-									TAS.error("PFBuffs.recalculate_recalculateBuffColumn:" + col + ", rowid" + id, err);
-									rowDone();
-								}
-							});
-						} catch (err2) {
-							TAS.error("PFBuffs.recalculate_recalculateBuffColumn OUTER error:" + col, err2);
-							totalItUp();
-						}
-					};
-				getSectionIDs("repeating_buff", function (ids) {
-					//TAS.debug("pfbuffsrecalculate there are " + _.size(ids) + " rows and " + numColumns + " columns");
+				},
+				idStr = PFUtils.getRepeatingIDStr(id),
+				prefix = "repeating_buff_" + idStr + "buff-" + col,
+				toggleErr=prefix + "_error",
+				//highlight error flag if they set ability buff to a negative number
+				setError = function(newval,oldval,changed){
+					var setter={};
 					try {
-						if (_.size(ids) > 0) {
-							_.each(allBuffColumns, function (col) {
-								recalculateBuffColumn(ids, col);
-							});
-						} else {
-							_.each(allBuffColumns, function (col) {
-								updateBuffTotals(col, columnDone, silently);
-							});
-						}
-					} catch (err) {
-						TAS.error("PFBuffs.recalculate_recalcbuffs", err);
-						//what to do? just quit
+						TAS.debug("setting error flag on " + col );
+						setter[toggleErr]=1;
+						setAttrs(setter,{silent:true});
+					} catch (err2){
+						TAS.error("PFBuffs.setBuff setError: error setting error flag on " + col + " for row " + id, err2);
+					} finally {
 						done();
 					}
-				});
-			},
-			events = {
-				// events pass in the column updated macro-text is "either", buffs are auto only
-				buffTotalNonAbilityEvents: {
-					//ranged and attack are in the PFAttackGrid module
-					"DMG": [PFAttackGrid.updateDamage],
-					"Fort": [PFSaves.updateSave],
-					"Will": [PFSaves.updateSave],
-					"Ref": [PFSaves.updateSave]
 				},
-				buffTotalAbilityEvents: {
-					"STR": [PFAbilityScores.updateAbilityScore],
-					"DEX": [PFAbilityScores.updateAbilityScore],
-					"CON": [PFAbilityScores.updateAbilityScore],
-					"INT": [PFAbilityScores.updateAbilityScore],
-					"WIS": [PFAbilityScores.updateAbilityScore],
-					"CHA": [PFAbilityScores.updateAbilityScore]
-				},
-				// events do NOT pass in column updated
-				buffTotalEventsNoParam: {
-					"AC": [PFDefense.updateDefenses],
-					"Touch": [PFDefense.updateDefenses],
-					"CMD": [PFDefense.updateDefenses],
-					"HP-temp": [PFHealth.updateTempMaxHP],
-					"Check": [PFChecks.applyConditions]
+				unsetError = function (newval, oldval, changed) {
+					getAttrs([toggleErr],function(v){
+						var setter={};
+						try {
+							if ((parseInt(v[toggleErr],10)||0)!==0){
+								setter[toggleErr]=0;
+								setAttrs(setter,{silent:true});
+							}
+						} catch (err) {
+							TAS.error("PFBuffs.setBuff unsetError: error clearing error flag on" + col + " for row " + id, err);
+						} finally {
+							done();
+						}
+					});
 				}
+				;
+			SWUtils.evaluateAndSetNumber(prefix + "_macro-text", prefix, 0, unsetError, silently,setError);
+		},
+		updateBuffTotals = function (col, callback) {
+			var done = _.once(function () {
+				if (typeof callback === "function") {
+					callback();
+				}
+			}),
+			isAbility  =(PFAbilityScores.abilities.indexOf(col) >= 0);
+			try {
+				TAS.repeating('buff').attrs('buff_' + col + '-total','buff_' + col + '-total_penalty').fields('buff-' + col, 'buff-enable_toggle', 'buff-' + col + '-show').reduce(function (m, r) {
+					try {
+						var tempM = (r.I['buff-' + col] * ((r.I['buff-enable_toggle']||0) & (r.I['buff-' + col + '-show']||0)));
+						tempM=tempM||0;
+						if(!(isAbility&&tempM<0)){
+							m.mod += tempM;
+						} else {
+							m.pen += tempM;
+						}
+					} catch (err) {
+						TAS.error("PFBuffs.updateBuffTotals error:" + col, err);
+					} finally {
+						return m;
+					}
+				}, {
+					mod: 0,
+					pen: 0
+				}, function (m, r, a) {
+					a.S['buff_' + col + '-total'] = m.mod||0;
+					toggleBuffStatusPanel(col, m.mod);
+					if (isAbility){
+						a.S['buff_' + col + '-total_penalty'] = m.pen||0;
+						TAS.debug("now also check ability penalty status");
+						toggleBuffStatusPanel(col+"_penalty", m.pen);
+					}
+				}).execute(done);
+			} catch (err2) {
+				TAS.error("PFBuffs.updateBuffTotals error:" + col, err2);
+				done();
+			}
+		},
+		recalculate = function (callback, silently, oldversion) {
+			var done = _.once(function () {
+					resetStatuspanel(function(){
+						TAS.debug("Leaving PFBuffs.recalculate");
+						if (typeof callback === "function") {
+							callback();
+						}
+					});
+				}),
+				numColumns = _.size(buffColumns),
+				columnDone = _.after(numColumns, done),
+				recalculateBuffColumn = function (ids, col) {
+					var rowtotal = _.size(ids),
+						totalItUp = _.once(function () {
+							updateBuffTotals(col, columnDone);
+						}),
+						rowDone = _.after(rowtotal, function () {
+							totalItUp();
+						});
+					try {
+						_.each(ids, function (id) {
+							try {
+								getAttrs(['repeating_buff_'+id+'_buff-enable_toggle',
+								'repeating_buff_'+id+'_buff-' + col + '-show'],function(v){
+									if (parseInt(v['repeating_buff_'+id+'_buff-enable_toggle'],10) && 
+										parseInt(v['repeating_buff_'+id+'_buff-' + col + '-show'],10) ) {
+											setBuff(id, col, rowDone, silently);
+									} else {
+										rowDone();
+									}
+								});
+							} catch (err) {
+								TAS.error("PFBuffs.recalculate_recalculateBuffColumn:" + col + ", rowid" + id, err);
+								rowDone();
+							}
+						});
+					} catch (err2) {
+						TAS.error("PFBuffs.recalculate_recalculateBuffColumn OUTER error:" + col, err2);
+						totalItUp();
+					}
+				};
+			getSectionIDs("repeating_buff", function (ids) {
+				//TAS.debug("pfbuffsrecalculate there are " + _.size(ids) + " rows and " + numColumns + " columns");
+				try {
+					if (_.size(ids) > 0) {
+						_.each(buffColumns, function (col) {
+							recalculateBuffColumn(ids, col);
+						});
+					} else {
+						_.each(buffColumns, function (col) {
+							updateBuffTotals(col, columnDone, silently);
+						});
+					}
+				} catch (err) {
+					TAS.error("PFBuffs.recalculate_recalcbuffs", err);
+					//what to do? just quit
+					done();
+				}
+			});
+		},
+		events = {
+			// events pass in the column updated macro-text is "either", buffs are auto only
+			buffTotalNonAbilityEvents: {
+				//ranged and attack are in the PFAttackGrid module
+				"Fort": [PFSaves.updateSave],
+				"Will": [PFSaves.updateSave],
+				"Ref": [PFSaves.updateSave]
 			},
-			registerEventHandlers = function () {
-				//BUFFS
-				_.each(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 + " for column " + col + ", event: " + eventInfo.sourceType);
-						setBuff(null, 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 PFBuffs_updateBuffTotalsShow(eventInfo) {
+			buffTotalAbilityEvents: {
+				"STR": [PFAbilityScores.updateAbilityScore],
+				"DEX": [PFAbilityScores.updateAbilityScore],
+				"CON": [PFAbilityScores.updateAbilityScore],
+				"INT": [PFAbilityScores.updateAbilityScore],
+				"WIS": [PFAbilityScores.updateAbilityScore],
+				"CHA": [PFAbilityScores.updateAbilityScore]
+			},
+			// events do NOT pass in column updated
+			buffTotalEventsNoParam: {
+				"DMG": [PFAttackGrid.updateDamage],
+				"AC": [PFDefense.updateDefenses],
+				"Touch": [PFDefense.updateDefenses],
+				"CMD": [PFDefense.updateDefenses],
+				"HP-temp": [PFHealth.updateTempMaxHP],
+				"Check": [PFChecks.applyConditions]
+			}
+		},
+		registerEventHandlers = function () {
+			//BUFFS
+			_.each(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 + " for column " + col + ", event: " + eventInfo.sourceType);
+					setBuff(null, 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 PFBuffs_updateBuffTotalsShow(eventInfo) {
+					TAS.debug("caught " + eventInfo.sourceAttribute + " event: " + eventInfo.sourceType);
+					if (eventInfo.sourceType !== "player" || /show/i.test(eventInfo.sourceAttribute)) {
+						updateBuffTotals(col);
+					}
+				}));
+			});
+			on("change:repeating_buff:buff-enable_toggle remove:repeating_buff", TAS.callback(function PFBuffs_updateBuffTotalsToggle(eventInfo) {
+				TAS.debug("caught " + eventInfo.sourceAttribute + " event: " + eventInfo.sourceType);
+				if (eventInfo.sourceType !== "player" || /toggle/i.test(eventInfo.sourceAttribute)) {
+					_.each(buffColumns, function (col) {
+						updateBuffTotals(col);
+					});
+				}
+			}));
+			//generic easy buff total updates
+			_.each(events.buffTotalNonAbilityEvents, function (functions, col) {
+				var eventToWatch = "change:buff_" + col + "-total";
+				_.each(functions, function (methodToCall) {
+					on(eventToWatch, TAS.callback(function event_updateBuffNonAbilityEvents(eventInfo) {
 						TAS.debug("caught " + eventInfo.sourceAttribute + " event: " + eventInfo.sourceType);
-						if (eventInfo.sourceType !== "player" || /show/i.test(eventInfo.sourceAttribute)) {
-							updateBuffTotals(col);
+						if (eventInfo.sourceType !== "player") {
+							methodToCall(col, eventInfo);
 						}
 					}));
 				});
-				on("change:repeating_buff:buff-enable_toggle remove:repeating_buff", TAS.callback(function PFBuffs_updateBuffTotalsToggle(eventInfo) {
-					TAS.debug("caught " + eventInfo.sourceAttribute + " event: " + eventInfo.sourceType);
-					if (eventInfo.sourceType !== "player" || /toggle/i.test(eventInfo.sourceAttribute)) {
-						_.each(buffColumns, function (col) {
-							updateBuffTotals(col);
-						});
-					}
-				}));
-				//generic easy buff total updates
-				_.each(events.buffTotalNonAbilityEvents, function (functions, col) {
-					var eventToWatch = "change:buff_" + col + "-total";
-					_.each(functions, function (methodToCall) {
-						on(eventToWatch, TAS.callback(function event_updateBuffNonAbilityEvents(eventInfo) {
-							TAS.debug("caught " + eventInfo.sourceAttribute + " event: " + eventInfo.sourceType);
-							if (eventInfo.sourceType !== "player") {
-								methodToCall(col, eventInfo);
-							}
-						}));
-					});
+			});
+			_.each(events.buffTotalAbilityEvents, function (functions, col) {
+				var eventToWatch = "change:buff_" + col + "-total change:buff_" + col + "-total_penalty";
+				_.each(functions, function (methodToCall) {
+					on(eventToWatch, TAS.callback(function event_updateBuffAbilityEvents(eventInfo) {
+						TAS.debug("caught " + eventInfo.sourceAttribute + " event: " + eventInfo.sourceType);
+						if (eventInfo.sourceType !== "player") {
+							methodToCall(col, eventInfo);
+						}
+					}));
 				});
-				_.each(events.buffTotalAbilityEvents, function (functions, col) {
-					var eventToWatch = "change:buff_" + col + "-total change:buff_" + col + "-total_penalty";
-					_.each(functions, function (methodToCall) {
-						on(eventToWatch, TAS.callback(function event_updateBuffAbilityEvents(eventInfo) {
-							TAS.debug("caught " + eventInfo.sourceAttribute + " event: " + eventInfo.sourceType);
-							if (eventInfo.sourceType !== "player") {
-								methodToCall(col, eventInfo);
-							}
-						}));
-					});
-				});				
-				_.each(events.buffTotalEventsNoParam, 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: " + eventInfo.sourceType);
-							if (eventInfo.sourceType !== "player") {
-								methodToCall(col, eventInfo);
-							}
-						}));
-					});
+			});				
+			_.each(events.buffTotalEventsNoParam, 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: " + eventInfo.sourceType);
+						if (eventInfo.sourceType !== "player") {
+							methodToCall(null,null,eventInfo);
+						}
+					}));
 				});
-			};
+			});
+		};
 		registerEventHandlers();
 		console.log(PFLog.l + '   PFBuffs module loaded          ' + PFLog.r, PFLog.bg);
 		PFLog.modulecount++;
@@ -22333,8 +22431,7 @@ var PFBuffs = PFBuffs || (function () {
 			resetStatuspanel: resetStatuspanel,
 			updateBuffTotals: updateBuffTotals
 		};
-	}
-	());
+	}());
 var PFNPCprev100 = PFNPCprev100 || (function () {
 		'use strict';
 		/* set is npc or not - for versions before .70  */
@@ -22641,8 +22738,7 @@ var PFNPCprev100 = PFNPCprev100 || (function () {
 			updateNPCMaxHP: updateNPCMaxHP,
 			updateSizeFromText: updateSizeFromText
 		};
-	}
-	());
+	}());
 var PFNPC = PFNPC || (function () {
 		'use strict';
 		var getAvgHP = function (hdice, hdie, health) {
@@ -22713,8 +22809,7 @@ var PFNPC = PFNPC || (function () {
 			getNPCHP: getNPCHP,
 			updateNPCMaxHP:updateNPCMaxHP
 		};
-	}
-	());
+	}());
 var NPCParser = NPCParser || (function () {
 		'use strict';
 		var naturalAttacks = ['arm', 'bite', 'claw', 'foreclaw', 'gore', 'hoof', 'kick', 'leg', 'pincer', 'quill', 'root', 'slam', 'snake bite', 'spike', 'spine', 'splinter', 'sting', 'tail', 'tail slap', 'talon', 'tendril', 'tentacle', 'thorn', 'tongue', 'vine', 'wing', 'buffet', 'slap'],
@@ -25085,8 +25180,7 @@ var NPCParser = NPCParser || (function () {
 		return {
 			importNPCFromCompendium: importNPCFromCompendium
 		};
-	}
-	());
+	}());
 var PFSheet = PFSheet || (function () {
 		'use strict';
 		var expandAll = function () {
@@ -25457,7 +25551,7 @@ var PFSheet = PFSheet || (function () {
 						PFAttacks.resetCommandMacro();
 					}
 					if (oldversion < 0.69){
-						PFDefense.updateDefenses();
+						PFDefense.updateDefenses(null,null,null);
 						PFNPCprev100.updateNPCMaxHP();
 					}
 					if (oldversion < 0.70){
@@ -25467,6 +25561,11 @@ var PFSheet = PFSheet || (function () {
 					if (oldversion < 0.71){
 						PFSkills.migrate68to71();
 					}
+					if (oldversion < 0.72){
+						PFSkills.resetCommandMacro();
+						PFAttacks.resetAllOptions();
+						PFBuffs.recalculate();
+					}
 					if (PFConst.version >= 1 && oldversion < 1) {
 						PFMigrate.migrateNPC();
 					}
@@ -25479,7 +25578,7 @@ var PFSheet = PFSheet || (function () {
 			},
 		/* recalculate - all pages in sheet!  */
 		recalculate = function (oldversion,callback) {
-			var silently = true,
+			var silently = false,
 				done = function () {
 					TAS.debug("leaving PFSheet.recalculate");
 					if (typeof callback === "function"){
@@ -25613,24 +25712,8 @@ var PFSheet = PFSheet || (function () {
 			checkForUpdate: checkForUpdate,
 			expandAll: expandAll
 		};
-	}
-	());
-console.log(' ');
-console.log(' ');
-console.log('         %cOOOOOO','background-color:blue;color:white;font-weight:bold;');
-console.log('      %cOOO      OOO','background-color:blue;color:white;font-weight:bold;');
-console.log('    %cOO   %c******%c   OO','background-color:blue;color:white;font-weight:bold;','background-color:red;color:white;font-weight:bold;','background-color:blue;color:white;font-weight:bold;');
-console.log('   %cO    %c**%c    %c**%c    O','background-color:blue;color:white;font-weight:bold;','background-color:red;color:white;font-weight:bold;','background-color:blue;color:white;font-weight:bold;','background-color:red;color:white;font-weight:bold;','background-color:blue;color:white;font-weight:bold;');
-console.log('  %cO    %c**%c            O','background-color:blue;color:white;font-weight:bold;','background-color:red;color:white;font-weight:bold;','background-color:blue;color:white;font-weight:bold;');
-console.log('  %cO    %c**%c            O','background-color:blue;color:white;font-weight:bold;','background-color:red;color:white;font-weight:bold;','background-color:blue;color:white;font-weight:bold;');
-console.log('  %cO    %c**%c            O','background-color:blue;color:white;font-weight:bold;','background-color:red;color:white;font-weight:bold;','background-color:blue;color:white;font-weight:bold;');
-console.log('   %cO    %c**%c    %c**%c    O','background-color:blue;color:white;font-weight:bold;','background-color:red;color:white;font-weight:bold;','background-color:blue;color:white;font-weight:bold;','background-color:red;color:white;font-weight:bold;','background-color:blue;color:white;font-weight:bold;');
-console.log('    %cOO   %c******%c   OO','background-color:blue;color:white;font-weight:bold;','background-color:red;color:white;font-weight:bold;','background-color:blue;color:white;font-weight:bold;');
-console.log('      %cOOO      OOO','background-color:blue;color:white;font-weight:bold;');
-console.log('	     %cOOOOOO','background-color:blue;color:white;font-weight:bold;');
-console.log(' ');
-console.log(' ');
-console.log('%c	  CUBS WIN! CUBS WIN!    ','background-color:white;color:blue;font-weight:bold;');
-console.log(' ');
+	}());
+
+
 	
 </script>
\ No newline at end of file
diff --git a/Pathfinder-Neceros/translation.json b/Pathfinder-Neceros/translation.json
index 773ded51f4..6b902fc5ce 100644
--- a/Pathfinder-Neceros/translation.json
+++ b/Pathfinder-Neceros/translation.json
@@ -104,6 +104,9 @@
 	"announce-38": "CREATURE PARSING in v1.00 see <em>beta link</em> in footer",
 	"announce-39": "Fixes for .71: Craft and other fill-in-the-name skills now update totals properly.",
 	"announce-40": "<strong>TAKE OUR SURVEY</strong>: https://www.surveymonkey.com/r/BL797KV",
+	"announce-41": "<strong>LASTPASS USERS NOTE:</strong> LastPass is still interfering with some Roll20 sheets. If you are experiencing degraded performance try disabling LastPass.",
+	"announce-42": "Fixes for .72: Buff check updates skills without hitting refresh. Damage mod applies correctly. Fixes to attack and damage not appearing in rolls. Recalc will finish. Requires Training no longer removes skill submenus from skill menu.",
+	"announce-43": "Thank you for your survey feedback. New changes are coming to simply the sheet making it much easier to use.",
 	"announcements": "Announcements:",
 	"announcements-old": "Old Announcements:",
 	"appraise": "Appraise",