diff --git a/Pathfinder-Neceros/pathfinder-neceros.html b/Pathfinder-Neceros/pathfinder-neceros.html
index c918732898..22ef83abfa 100644
--- a/Pathfinder-Neceros/pathfinder-neceros.html
+++ b/Pathfinder-Neceros/pathfinder-neceros.html
@@ -1489,7 +1489,7 @@
                     </select>                   
                 </span>
                 <span class="sheet-table-row-name"><button class="sheet-text-button" type="roll" title="%{selected|Spell-Fail-Check}" name="roll_Spell-Fail-Check" style="font-size:13px; line-height:10px; vertical-align:text-bottom;" value="@{PC-whisper} &{template:pf_generic} {{header_image=@{header_image-pf_generic}}} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{subtitle}} {{name=Spell Fail}} {{Spell Fail Chance=[[ @{spell-fail} ]]}} {{Check=[[ 1d100 ]]}}"> Spell Fail Chance</button></span>
-                <span class="sheet-table-data sheet-center"><input title="@{spell-fail}" type="text" name="attr_spell-fail" value="( ((@{armor-spell-fail}*@{armor-equipped}) + (@{armor2-spell-fail}*@{armor2-equipped})) + ((@{shield-spell-fail}*@{shield-equipped}) + (@{shield2-spell-fail}*@{shield2-equipped})) )" style="width:3.5em;" disabled />&#37;</span>
+                <span class="sheet-table-data sheet-center"><input title="@{spell-fail}" type="number" name="attr_spell-fail" value="0" style="width:3.5em;" class="sheet-calc" readonly="readonly" />&#37;</span>
             </div>
         </div>
         <br>
@@ -1663,10 +1663,10 @@
             <div class="sheet-table-row">
                 <span class="sheet-table-data sheet-center"><label><input title="@{armor-equipped}" type="checkbox" name="attr_armor-equipped" value="1" /><b title="Primary Armor">&nbsp;&nbsp;Armor 1</b></label></span>
                 <span class="sheet-table-data sheet-center"><input title="@{armor}" type="text" name="attr_armor" placeholder="Armor 1" class="sheet-detail-medium" /></span>
-                <span class="sheet-table-data sheet-center"><input title="@{armor-acbonus}" type="number" name="attr_armor-acbonus" value="0" /></span>
-                <span class="sheet-table-data sheet-center"><input title="@{armor-max-dex}" type="number" name="attr_armor-max-dex" value=99 min="0" max=99 /></span>
-                <span class="sheet-table-data sheet-center"><input title="@{armor-acp}" type="number" name="attr_armor-acp" value="0" max="0" /></span>
-                <span class="sheet-table-data sheet-center"><input title="@{armor-spell-fail}" type="number" name="attr_armor-spell-fail" value="0" min="0" max="100" />&#37;</span>
+                <span class="sheet-table-data sheet-center"><input title="@{armor-acbonus}" type="number" name="attr_armor-acbonus" value="" min="0" /></span>
+                <span class="sheet-table-data sheet-center"><input title="@{armor-max-dex}" type="number" name="attr_armor-max-dex" value="" min="0"  /></span>
+                <span class="sheet-table-data sheet-center"><input title="@{armor-acp}" type="number" name="attr_armor-acp" value="" max="0" /></span>
+                <span class="sheet-table-data sheet-center"><input title="@{armor-spell-fail}" type="number" name="attr_armor-spell-fail" value="" min="0" max="100" />&#37;</span>
                 <span class="sheet-table-data sheet-center">
                     <select title="@{armor-type}" name="attr_armor-type">
                         <option value="Light">Light</option>
@@ -1685,10 +1685,10 @@
             <div class="sheet-table-row">
                 <span class="sheet-table-data sheet-center"><label><input title="@{armor2-equipped}" type="checkbox" name="attr_armor2-equipped" value="1" /><b title="Alternate Armor">&nbsp;&nbsp;Armor 2</b></label></span>
                 <span class="sheet-table-data sheet-center"><input title="@{armor2}" type="text" name="attr_armor2" placeholder="Armor 2" class="sheet-detail-medium" /></span>
-                <span class="sheet-table-data sheet-center"><input title="@{armor2-acbonus}" type="number" name="attr_armor2-acbonus" value="0" /></span>
-                <span class="sheet-table-data sheet-center"><input title="@{armor2-max-dex}" type="number" name="attr_armor2-max-dex" value=99 min="0" max=99  /></span>
-                <span class="sheet-table-data sheet-center"><input title="@{armor2-acp}" type="number" name="attr_armor2-acp" value="0" max="0" /></span>
-                <span class="sheet-table-data sheet-center"><input title="@{armor2-spell-fail}" type="number" name="attr_armor2-spell-fail" value="0" min="0" max="100" />&#37;</span>
+                <span class="sheet-table-data sheet-center"><input title="@{armor2-acbonus}" type="number" name="attr_armor2-acbonus" value="" min="0" /></span>
+                <span class="sheet-table-data sheet-center"><input title="@{armor2-max-dex}" type="number" name="attr_armor2-max-dex" value="" min="0"   /></span>
+                <span class="sheet-table-data sheet-center"><input title="@{armor2-acp}" type="number" name="attr_armor2-acp" value="" max="0" /></span>
+                <span class="sheet-table-data sheet-center"><input title="@{armor2-spell-fail}" type="number" name="attr_armor2-spell-fail" value="" min="0" max="100" />&#37;</span>
                 <span class="sheet-table-data sheet-center">
                     <select title="@{armor2-type}" name="attr_armor2-type">
                         <option value="Light">Light</option>
@@ -1707,10 +1707,10 @@
             <div class="sheet-table-row">
                 <span class="sheet-table-data sheet-center"><label><input title="@{shield-equipped}" type="checkbox" name="attr_shield-equipped" value="1" /><b title="Primary Shield">&nbsp;&nbsp;Shield 1</b></label></span>
                 <span class="sheet-table-data sheet-center"><input title="@{shield}" type="text" name="attr_shield" placeholder="Shield 1" class="sheet-detail-medium" /></span>
-                <span class="sheet-table-data sheet-center"><input title="@{shield-acbonus}" type="number" name="attr_shield-acbonus" value="0" /></span>
-                <span class="sheet-table-data sheet-center"><input title="@{shield-max-dex}" type="number" name="attr_shield-max-dex" value=99 min="0" max=99 /></span>
-                <span class="sheet-table-data sheet-center"><input title="@{shield-acp}" type="number" name="attr_shield-acp" value="0" max="0" /></span>
-                <span class="sheet-table-data sheet-center"><input title="@{shield-spell-fail}" type="number" name="attr_shield-spell-fail" value="0" min="0" max="100" />&#37;</span>
+                <span class="sheet-table-data sheet-center"><input title="@{shield-acbonus}" type="number" name="attr_shield-acbonus" value="" min="0" /></span>
+                <span class="sheet-table-data sheet-center"><input title="@{shield-max-dex}" type="number" name="attr_shield-max-dex" value="" min="0"  /></span>
+                <span class="sheet-table-data sheet-center"><input title="@{shield-acp}" type="number" name="attr_shield-acp" value="" max="0" /></span>
+                <span class="sheet-table-data sheet-center"><input title="@{shield-spell-fail}" type="number" name="attr_shield-spell-fail" value="" min="0" max="100" />&#37;</span>
                 <span class="sheet-table-data sheet-center">
                     <select title="@{shield-type}" name="attr_shield-type">
                         <option value="Shield">Shield</option>
@@ -1727,10 +1727,10 @@
             <div class="sheet-table-row">
                 <span class="sheet-table-data sheet-center"><label><input title="@{shield2-equipped}" type="checkbox" name="attr_shield2-equipped" value="1" /><b title="Alternate Shield">&nbsp;&nbsp;Shield 2</b></label></span>
                 <span class="sheet-table-data sheet-center"><input title="@{shield2}" type="text" name="attr_shield2" placeholder="Shield 2" class="sheet-detail-medium" /></span>
-                <span class="sheet-table-data sheet-center"><input title="@{shield2-acbonus}" type="number" name="attr_shield2-acbonus" value="0" /></span>
-                <span class="sheet-table-data sheet-center"><input title="@{shield2-max-dex}" type="number" name="attr_shield2-max-dex" value=99 min="0" max=99  /></span>
-                <span class="sheet-table-data sheet-center"><input title="@{shield2-acp}" type="number" name="attr_shield2-acp" value="0" max="0" /></span>
-                <span class="sheet-table-data sheet-center"><input title="@{shield2-spell-fail}" type="number" name="attr_shield2-spell-fail" value="0" min="0" max=100 />&#37;</span>
+                <span class="sheet-table-data sheet-center"><input title="@{shield2-acbonus}" type="number" name="attr_shield2-acbonus" value="" min="0" /></span>
+                <span class="sheet-table-data sheet-center"><input title="@{shield2-max-dex}" type="number" name="attr_shield2-max-dex" value="" min="0" max=99  /></span>
+                <span class="sheet-table-data sheet-center"><input title="@{shield2-acp}" type="number" name="attr_shield2-acp" value="" max="0" /></span>
+                <span class="sheet-table-data sheet-center"><input title="@{shield2-spell-fail}" type="number" name="attr_shield2-spell-fail" value="" min="0" max=100 />&#37;</span>
                 <span class="sheet-table-data sheet-center">
                     <select title="@{shield2-type}" name="attr_shield2-type">
                         <option value="Shield">Shield</option>
@@ -9760,8 +9760,16 @@
 		<span class="sheet-table-name">Sheet configuration</span>
             <div class="sheet-table-row">
 				<span class="sheet-table-data sheet-left"><label><span title="Syncs @{NPC-HP} to @{HP} if using @{HP} for npc/monster hit points."><input type="checkbox" title="@{sync_npc_pc_hp}" name="attr_sync_npc_pc_hp" value="1" checked="checked" /> Editing NPC HP updates PC HP</span></label></span>
-				<span class="sheet-table-data sheet-left"><label><span title="All NPC rolls will be whispered to the GM."><input type="checkbox" title="@{NPC-whisper}" name="attr_NPC-whisper" value="/w gm" checked="checked" /> Whisper NPC rolls to GM?</span></label></span>
-				<span class="sheet-table-data sheet-left"><label><span title="All PC rolls will be whispered to the GM."><input type="checkbox" title="@{PC-whisper}" name="attr_PC-whisper" value="/w gm" /> Whisper PC rolls to GM?</span></label></span>
+				<span class="sheet-table-data sheet-left"><label>NPC rolls: Whisper to GM or broadcast publicaly<span title="All NPC rolls will be whispered to the GM.">
+					<select name="attr_NPC-whisper">
+					<option value="">Public Rolls</option>
+					<option value="/w gm" selected>Whisper GM</option>
+					</select></label></span>								
+				<span class="sheet-table-data sheet-left"><label>PC rolls: Whisper to GM or broadcast publicaly <span title="All PC rolls will be whispered to the GM.">
+					<select name="attr_PC-whisper">
+					<option value="" selected>Public Rolls</option>
+					<option value="/w gm">Whisper GM</option>
+					</select></label></span>
 			</div>
         </div>
 	<br>	
@@ -10214,6 +10222,8 @@
     </table>
 </rolltemplate>
 </div>
+
+
 <script type="text/worker">
 // var getSectionIDs=function(){};
 // var getAttrs=function(){};
@@ -12741,7 +12751,7 @@ on("change:saves-cond change:total-will change:will-ability-mod change:will-trai
 	PFSheet.updateSave("Will"); });
 
 //defenses
-on("change:condition-stunned change:condition-flat-footed change:ac-ability-mod change:ff-dex change:ac-penalty change:size change:ac-dodge change:ac-natural change:ac-deflect change:ac-armor change:ac-misc change:ac-shield change:buff_ac-total change:cmd-dex change:ff-cmd-dex change:cmd-str change:bab change:max-dex",function() {
+on("change:condition-stunned change:condition-flat-footed change:ac-ability-mod change:ff-dex change:ac-penalty change:size change:ac-dodge change:ac-natural change:ac-deflect change:ac-misc change:ac-shield change:ac-armor change:buff_ac-total change:cmd-dex change:ff-cmd-dex change:cmd-str change:bab change:max-dex",function() {
     PFSheet.updateDefenses(); });
 on("change:shield-equipped change:shield-acbonus change:shield-max-dex change:shield-acp change:shield-spell-fail change:shield-proficiency change:shield2-equipped change:shield2-acbonus change:shield2-max-dex change:shield2-acp change:shield2-spell-fail change:shield2-proficiency change:armor-equipped change:armor-acbonus change:armor-max-dex change:armor-acp change:armor-spell-fail change:armor-proficiency change:armor2-equipped change:armor2-acbonus change:armor2-max-dex change:armor2-acp change:armor2-spell-fail change:armor2-proficiency",function(){
     PFSheet.updateArmor(); });
@@ -12799,18 +12809,18 @@ on("change:buff_dmg-total",function(){PFSheet.copyStaticNumberFieldToRepeating("
 on("change:total-skill change:total-fcskill change:int-mod change:level change:max-skill-ranks-mod change:class-0-level change:class-1-level change:class-2-level change:class-3-level change:class-4-level",function() { PFSheet.updateMaxSkills(); });
 on("change:max-skill-ranks-misc",function(){SWUtils.evaluateAndSetNumber("Max-Skill-Ranks-Misc","Max-Skill-Ranks-mod");});
 
-//on("change:acrobatics-ability",function(){PFSheet.handleDropdown("Acrobatics-ability",["Acrobatics-ability-mod"]);});
-//on("change:acp change:Acrobatics-cs change:Acrobatics-ranks change:Acrobatics-class change:Acrobatics-ability change:Acrobatics-ability-mod change:Acrobatics-racial change:Acrobatics-feat change:Acrobatics-item change:Acrobatics-size change:Acrobatics-acp change:Acrobatics-misc change:Acrobatics-ReqTrain"
-//   ,function(){PFSheet.updateSkill("Acrobatics");});
+// on("change:acrobatics-ability",function(){PFSheet.handleDropdown("Acrobatics-ability",["Acrobatics-ability-mod"]);});
+// on("change:acp change:Acrobatics-cs change:Acrobatics-ranks change:Acrobatics-class change:Acrobatics-ability change:Acrobatics-ability-mod change:Acrobatics-racial change:Acrobatics-feat change:Acrobatics-item change:Acrobatics-size change:Acrobatics-acp change:Acrobatics-misc change:Acrobatics-ReqTrain"
+   // ,function(){PFSheet.updateSkill("Acrobatics");});
 
-//on("change:fly-ability",function(){PFSheet.handleDropdown("Fly-ability",["Fly-ability-mod"]);});
-//on("change:acp change:size_skill change:Fly-cs change:Fly-ranks change:Fly-class change:Fly-ability change:Fly-ability-mod change:Fly-racial change:Fly-feat change:Fly-item change:Fly-size change:Fly-acp change:Fly-misc change:Fly-ReqTrain"
-//   ,function(){PFSheet.updateSkill("Fly");});
+// on("change:fly-ability",function(){PFSheet.handleDropdown("Fly-ability",["Fly-ability-mod"]);});
+// on("change:acp change:size_skill change:Fly-cs change:Fly-ranks change:Fly-class change:Fly-ability change:Fly-ability-mod change:Fly-racial change:Fly-feat change:Fly-item change:Fly-size change:Fly-acp change:Fly-misc change:Fly-ReqTrain"
+   // ,function(){PFSheet.updateSkill("Fly");});
 
    
-on("change:stealth-ability",function(){PFSheet.handleDropdown("Stealth-ability",["Stealth-ability-mod"]);});
-on("change:acp change:size_skill_double change:Stealth-cs change:Stealth-ranks change:Stealth-class change:Stealth-ability change:Stealth-ability-mod change:Stealth-racial change:Stealth-feat change:Stealth-item change:Stealth-size change:Stealth-acp change:Stealth-misc change:Stealth-ReqTrain"
-   ,function(){PFSheet.updateSkill("Stealth");});
+// on("change:stealth-ability",function(){PFSheet.handleDropdown("Stealth-ability",["Stealth-ability-mod"]);});
+// on("change:acp change:size_skill_double change:Stealth-cs change:Stealth-ranks change:Stealth-class change:Stealth-ability change:Stealth-ability-mod change:Stealth-racial change:Stealth-feat change:Stealth-item change:Stealth-size change:Stealth-acp change:Stealth-misc change:Stealth-ReqTrain"
+   // ,function(){PFSheet.updateSkill("Stealth");});
 
 //size
 on("change:size",function(){ PFSheet.updateSize()});