diff --git a/Classified/Classified.html b/Classified/Classified.html
index cc33c6aa2f..7bc9119fe4 100644
--- a/Classified/Classified.html
+++ b/Classified/Classified.html
@@ -1,8 +1,7 @@
 <input type="checkbox" style="display:none" name="attr_show_npc" value="1">
 <input type="number" style="display:none" name="attr_setup_done" value="0">
-<input type="text" class="sheet-hideIt" name=attr_targetselect value="?{Target Speed|1}">
-<input type="text" class="sheet-hideIt" name=attr_drawTurn value="1D100">
-
+<input type="text" class="sheet-hideIt" name="attr_targetselect" value="?{Target Speed|1}">
+<input type="text" class="sheet-hideIt" name="attr_drawTurn" value="1D100">
 
 <input type="checkbox" style="display:none" name="attr_hideboating"  value="1">
 <input type="checkbox" style="display:none" name="attr_hidecryptography"  value="1">
@@ -2143,10 +2142,10 @@
 							<button type="roll" class="sheet-text_roll sheet-Attack btn ui-draggable" value="&{template:scar} {{scarRoll=[[1d100]]}} {{scarLocRoll=[[1D100]]}} {{scarChance=[[?{Wound:|MW,5|HW,15|INCAP,25}]]}}" data-i18n="Scar">Scar</button>
 						</div>
 						<div>
-							<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="&{template:pain} {{roll=[[1d100]]}}  {{PR=[[@{painDf}*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+							<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="&{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDf}+?{DF  Mod.|0})*@{WIL}]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 						</div>
 						<div>
-							<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="&{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[@{h2hDf}*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+							<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="&{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDf}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
 						</div>
 						<input type="text" name="attr_h2hDf" value="1000" style="display:none">
 					</div>
@@ -4144,7 +4143,7 @@ Fields of Experience:
 							</div>
 							<div class="sheet-squadInfoItem">
 								<div><span class="sheet-CharAbriv"  data-i18n="Stamina2">STAMINA</span>:</div>
-								<div><input class="sheet-charValue sheet-charValue1"  type="text" name="attr_runSwim" value="0"></div>	
+								<div><input class="sheet-charValue sheet-charValue1"  type="text" name="attr_stamina" value="0"></div>	
 							</div>							
 						</div>
 						<div class="sheet-squadInfoGrid">
@@ -4480,10 +4479,10 @@ Fields of Experience:
 						</div>
 						<div class="sheet-mjrNPCbuttonsGrid">
 							<div>
-								<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[@{painDf}*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+								<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDf}+?{DF  Mod.|0})*@{WIL}]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 							</div>
 							<div>
-								<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[@{h2hDf}*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+								<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDf}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
 							</div>
 						</div>						
 						<input type="text" class="sheet-hideIt" value="0" name="attr_wndStatus1">	
@@ -5519,10 +5518,10 @@ Ammo: xx/xx  #x
 </textarea>
 								<div class="sheet-squadbuttonsGrid">
 									<div>
-										<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[@{painDfSqd1}*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+										<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd1}+?{DF  Mod.|0})*@{WIL}]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 									</div>
 									<div>
-										<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[@{h2hDfSqd1}*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+										<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd1}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
 									</div>
 									
 								</div>									
@@ -5570,10 +5569,10 @@ Ammo: xx/xx  #x
 </textarea>
 									<div class="sheet-squadbuttonsGrid">
 										<div>
-											<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[@{painDfSqd2}*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+											<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd2}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 										</div>
 										<div>
-											<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[@{h2hDfSqd2}*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+											<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd2}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
 										</div>
 										
 									</div>									
@@ -5622,10 +5621,10 @@ Ammo: xx/xx  #x
 </textarea>
 									<div class="sheet-squadbuttonsGrid">
 										<div>
-											<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[@{painDfSqd3}*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+											<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd3}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 										</div>
 										<div>
-											<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[@{h2hDfSqd3}*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+											<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd3}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
 										</div>
 										
 									</div>									
@@ -5674,10 +5673,10 @@ Ammo: xx/xx  #x
 </textarea>
 									<div class="sheet-squadbuttonsGrid">
 										<div>
-											<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[@{painDfSqd4}*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+											<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd4}+?{DF  Mod.|0})*@{WIL}]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 										</div>
 										<div>
-											<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[@{h2hDfSqd4}*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+											<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd4}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
 										</div>
 										
 									</div>									
@@ -5727,10 +5726,10 @@ Ammo: xx/xx  #x
 </textarea>
 								<div class="sheet-squadbuttonsGrid">
 									<div>
-										<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[@{painDfSqd5}*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+										<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd5}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 									</div>
 									<div>
-										<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[@{h2hDfSqd5}*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+										<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd5}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
 									</div>
 									
 								</div>									
@@ -5778,10 +5777,10 @@ Ammo: xx/xx  #x
 </textarea>
 									<div class="sheet-squadbuttonsGrid">
 										<div>
-											<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[@{painDfSqd6}*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+											<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd6}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 										</div>
 										<div>
-											<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[@{h2hDfSqd6}*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+											<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd6}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
 										</div>
 										
 									</div>									
@@ -5830,10 +5829,10 @@ Ammo: xx/xx  #x
 </textarea>
 									<div class="sheet-squadbuttonsGrid">
 										<div>
-											<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[@{painDfSqd7}*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+											<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd7}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 										</div>
 										<div>
-											<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[@{h2hDfSqd7}*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+											<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd7}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
 										</div>
 										
 									</div>									
@@ -5882,10 +5881,10 @@ Ammo: xx/xx  #x
 </textarea>
 									<div class="sheet-squadbuttonsGrid">
 										<div>
-											<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[@{painDfSqd8}*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+											<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd8}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 										</div>
 										<div>
-											<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[@{h2hDfSqd8}*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+											<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd8}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
 										</div>
 										
 									</div>									
@@ -5935,10 +5934,10 @@ Ammo: xx/xx  #x
 </textarea>
 										<div class="sheet-squadbuttonsGrid">
 											<div>
-												<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[@{painDfSqd9}*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+												<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd9}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 											</div>
 											<div>
-												<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[@{h2hDfSqd9}*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+												<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd9}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
 											</div>
 											
 										</div>									
@@ -5986,10 +5985,10 @@ Ammo: xx/xx  #x
 </textarea>
 											<div class="sheet-squadbuttonsGrid">
 												<div>
-													<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[@{painDfSqd10}*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+													<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd10}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 												</div>
 												<div>
-													<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[@{h2hDfSqd10}*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+													<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd10}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
 												</div>
 												
 											</div>									
@@ -6038,10 +6037,10 @@ Ammo: xx/xx  #x
 </textarea>
 											<div class="sheet-squadbuttonsGrid">
 												<div>
-													<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[@{painDfSqd11}*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+													<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd11}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 												</div>
 												<div>
-													<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[@{h2hDfSqd11}*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+													<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd11}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
 												</div>
 												
 											</div>									
@@ -6090,10 +6089,10 @@ Ammo: xx/xx  #x
 </textarea>
 											<div class="sheet-squadbuttonsGrid">
 												<div>
-													<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[@{painDfSqd12}*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
+													<button type="roll" name="roll_pain" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:pain} {{roll=[[1d100]]}}  {{PR=[[(@{painDfSqd12}+?{DF  Mod.|0})*@{WIL} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="Pain">Pain</button>	
 												</div>
 												<div>
-													<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[@{h2hDfSqd12}*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
+													<button type="roll" name="roll_h2hStun" class="sheet-text_roll sheet-Attack btn ui-draggable" value="@{whisperStr} &{template:h2hStun} {{roll=[[1d100]]}}  {{PR=[[(@{h2hDfSqd12}+?{DF  Mod.|0})*@{STR} ]]}} {{WILL=[[@{WIL}]]}}" data-i18n="h2hstun2">H-to-H Stun</button>	
 												</div>
 												
 											</div>									
@@ -6647,7 +6646,7 @@ console.log("checkbox: value"+[skill]);
 
 			if (parseInt(values.setup_done)===0){
 					console.log("setup not done");
-					setAttrs({wndStatus:"0"},{silent:false})
+					//setAttrs({wndStatus:"0"},{silent:false})
 					///setattrs doesnt seem to fire events when called from inside opne sheet
 					///so the below is pointless
 					//setAttrs({str:"5",dex:5,wil:5,per:5,int:5},{silent:false});