diff --git a/D6StarWars/D6StarWars.html b/D6StarWars/D6StarWars.html
index 41f5d2fc7a..4cf8425ed3 100644
--- a/D6StarWars/D6StarWars.html
+++ b/D6StarWars/D6StarWars.html
@@ -188,7 +188,7 @@
 				<input class="sheet-smallnumber sheet-shortnumber" type="number" name="attr_ROF"/>
 				<input class="sheet-smallnumber sheet-shortnumber" type="number" name="attr_Ammo"/>
 			</fieldset>
-			<button  type="roll" value="&{template:default} {{name=@{weapon}}} {{Roll=[[({@{damagedice}- 1)d6cf0cs7 + @{damagepip},1d6!cf1cs6}]]}}">Damage</button>		  
+			<button  type="roll" value="&{template:default} {{name=@{weaponname}}} {{Roll=[[(@{damagedice}- 1)d6cf0cs7 + @{damagepip} + (1d6!cf1cs6)]]}}">Damage</button>		  
     </div>
 
 	<div id="Armor" class="sheet-section">
@@ -201,13 +201,13 @@
 			</tr>
 		</table>
 			<fieldset class="repeating_armors">
-				<input class="sheet-skilltext" type="text"  style="width:200px" name="attr_armor1"/>
-				<input type="number" name="attr_armor1PhDice" class="sheet-smallnumber sheet-shortnumber" min="1" value="1"/>D+<input type="number" name="attr_armor1PhPip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="0"/>
-				<input type="number" name="attr_armor1EnDice" class="sheet-smallnumber sheet-shortnumber" min="1" value="1"/>D+<input type="number" name="attr_armor1EnPip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="0"/>
-				<input class="sheet-skilltext" type="text" name="attr_armor1_other"/>
-				<button  type="roll" value="&{template:default} {{name=Damage Soak (Physical)}} {{Roll=[[({@{armor1PhDice} +@{strength} +@{WoundStatus} +@{Force_ControlPain_ResistStun} - 1)d6cf0cs7 + @{armor1PhPip},1d6!cf1cs6}]]}}">Soak Physical</button>
-				<button  type="roll" value="&{template:default} {{name=Damage Soak (Energy)}} {{Roll=[[({@{armor1EnDice} +@{strength} +@{WoundStatus} +@{Force_ControlPain_ResistStun} - 1)d6cf0cs7 + @{armor1EnPip},1d6!cf1cs6}]]}}">Soak Energy</button>
-				<button  type="roll" value="&{template:default} {{name=Damage Soak}} {{Roll=[[({@{strength} +@{WoundStatus} +@{Force_ControlPain_ResistStun} - 1)d6cf0cs7,1d6!cf1cs6}]]}}">Soak</button>	  
+				<input class="sheet-skilltext" type="text"  style="width:200px" name="attr_armorname"/>
+				<input type="number" name="attr_armorPhDice" class="sheet-smallnumber sheet-shortnumber" min="1" value="1"/>D+<input type="number" name="attr_armorPhPip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="0"/>
+				<input type="number" name="attr_armorEnDice" class="sheet-smallnumber sheet-shortnumber" min="1" value="1"/>D+<input type="number" name="attr_armorEnPip" class="sheet-smallnumber sheet-shortnumber" min="0" max="2" value="0"/>
+				<input class="sheet-skilltext" type="text" name="attr_armor_other"/>
+				<button  type="roll" value="&{template:default} {{name=Damage Soak (Physical)}} {{Roll=[[(@{strength} @{armorPhDice} +@{WoundStatus} +@{Force_ControlPain_ResistStun} - 1)d6cf0cs7 @{armorPhPip} + 1d6!cf1cs6]]}}">Soak Physical</button>
+				<button  type="roll" value="&{template:default} {{name=Damage Soak (Energy)}} {{Roll=[[(@{strength} @{armorEnDice} +@{WoundStatus} +@{Force_ControlPain_ResistStun} - 1)d6cf0cs7 @{rmorEnPip} + 1d6!cf1cs6]]}}">Soak Energy</button>
+				<button  type="roll" value="&{template:default} {{name=Damage Soak}} {{Roll=[[(@{strength} +@{WoundStatus} +@{Force_ControlPain_ResistStun} - 1)d6cf0cs7 + 1d6!cf1cs6]]}}">Soak</button>	  
 			</fieldset>
 	</div>
 	
@@ -255,21 +255,21 @@
                 <label style="padding-top:8px; padding-bottom:12px;">Force Powers </label>
                 <textarea name="attr_forcePowers" style="height:120px;"></textarea>
             </div>
-			<div class='sheet-col'>
+			<div class='sheet-col'><!---Force Emptiness --->
                 <label style="padding-top:8px; padding-bottom:12px;">Force Emptiness active?</label><!---Force Emptiness adds +6 pips to all force skill rolls when active --->
 					<select name="attr_Force_Emptiness" class="sheet-smallselect">
 					  <option value="0" selected="selected">No</option>
 					  <option value="6">Yes</option>
 					</select>
             </div>
-			<div class='sheet-col'>
+			<div class='sheet-col'><!---Force Control pain/ resist stun --->
                 <label style="padding-top:8px; padding-bottom:12px;">Control Pain/Resist Stun active?</label><!---Negates any wound penalties to rolls if active --->
 					<select name="attr_Force_ControlPain_ResistStun" class="sheet-smallselect">
 					  <option value="0" selected="selected">No</option>
 					  <option value="-@{WoundStatus}">Yes</option>
 					</select>
             </div>
-			<div class='sheet-col'>
+			<div class='sheet-col'><!---Force Powers active --->
                 <label style="padding-top:8px; padding-bottom:12px;">Force powers active?</label><!---gives penalty to all rolls thanks to concentration/distraction --->
 					<select name="attr_Force_Up" class="sheet-smallselect">
 					  <option value="0" selected="selected">No</option>