diff --git a/Shadowrun5e/Shadowrun5.html b/Shadowrun5e/Shadowrun5.html
index 35ca1db1a0..325e259ff7 100644
--- a/Shadowrun5e/Shadowrun5.html
+++ b/Shadowrun5e/Shadowrun5.html
@@ -11,7 +11,7 @@
     
         <div class="sheet-col">    
             <label>Player:</label><input type="text" name="attr_player" /><br />
-            <label>Notes:</label><input type="text" name="attr_notes" />    	
+            <label>Notes:</label><input type="text" name="attr_notes" />        
         </div> 
     </div>
     
@@ -56,7 +56,7 @@
             
             <!--Primary Armor -->
             
-				<div class="sheet-baseinfo" style="width:200px;"><input type="text" name="attr_cciarmorname" /><!--value="@{armorname}" disabled="true"--> <label class="sheet-medium">Primary Armor</label></div>
+    			<div class="sheet-baseinfo" style="width:200px;"><input type="text" name="attr_cciarmorname" value="@{armorname}" disabled="true" /> <label class="sheet-medium">Primary Armor</label></div>
 				<div class="sheet-baseinfo" style="width:42px;"><input type="number" name="attr_cciarmor" value="@{armor}" disabled="true" /><label style="width:50px;">Rating</label></div>
 				<div class="sheet-baseinfo" style="width:42px;"><input type="number" name="attr_cciarmormisc" value="@{armormisc}" disabled="true"><label style="width:40px;">Misc</label></div>
 				<div class="sheet-baseinfo" style="width:42px;"><button type="roll" name="roll_ccidefense"
@@ -65,25 +65,25 @@
                 
              <!-- CCI Ranged Weapon -->
              
-				<label class="sheet-long">Primary Ranged Weapon</label><input type="text" name="attr_cciprimaryweaponname" style="width:180px;" /><!--value="@{primaryweaponname}" disabled="true"--> <br />
+				<label class="sheet-long">Primary Ranged Weapon</label><input type="text" name="attr_cciprimaryweaponname" style="width:180px;" value="@{primaryweaponname}" disabled="true" /> <br />
 				<div class="sheet-baseinfo" style="width:32px;"><input type="number" name="attr_cciprimaryweaponacc" style="width:30px;" value="@{primaryweaponacc}" disabled="true"  /><label>ACC</label></div>                
 				<div class="sheet-baseinfo" style="margin-left:5px; width:32px;"><input type="text" name="attr_cciprimaryweapondam" style="width:30px;" value="@{primaryweapondam}" disabled="true"  /><label>DV</label></div>
 				<div class="sheet-baseinfo" style="width:32px;"><input type="number" name="attr_cciprimaryweaponap" style="width:30px;" value="@{primaryweaponap}" disabled="true"  /><label>AP</label></div>
 				<div class="sheet-baseinfo" style="width:100px;">
-                <input type="text" name="cciprimaryweaponmode" style="width:100px;" /><!--value="@{primaryweaponmode}" disabled="true"--> 
+                <input type="text" name="cciprimaryweaponmode" style="width:100px;" value="@{primaryweaponmode}" disabled="true" /> 
 					<label>Mode</label></div>
 				<div class="sheet-baseinfo" style="width:32px;"><input type="number" name="attr_cciprimaryweaponrc" style="width:30px;" value="@{primaryweaponrc}" disabled="true"  /><label>RC</label></div>
-				<div class="sheet-baseinfo" style="width:32px;"><input type="number" name="attr_cciprimaryweaponammo" style="width:30px;" /><label>Ammo</label></div>
+				<div class="sheet-baseinfo" style="width:32px;"><input type="number" name="attr_cciprimaryweaponammo" style="width:30px;" value="@{primaryweaponammo}" disabled="true" /><label>Ammo</label></div>
 				<div class="sheet-baseinfo" style="width:32px;"><input type="number" name="attr_cciprimaryweaponskill" style="width:30px;" value="@{primaryweaponskill}" disabled="true"  /><label>Skill</label></div>
 				<div class="sheet-baseinfo" style="width:32px;">
 					<button type="roll" name="roll_cciattackprimary"
-						value="/em shoots his/her @{primaryweaponname}! AP: [[@{primaryweaponap}]] || DV: [[@{primaryweapondam}]] || Acc: [[@{primaryweaponacc}]]\n/roll ([[@{primaryweaponskill}+@{agility}+?{Modifiers?|0}]]-@{woundmod})d6>5s"></button>
+						value="/em shoots their @{primaryweaponname}! AP: [[@{primaryweaponap}]] || DV: [[@{primaryweapondam}]] || Acc: [[@{primaryweaponacc}]]\n/roll ([[@{primaryweaponskill}+@{agility}+?{Modifiers?|0}]]-@{woundmod})d6>5s"></button>
 				<label>Attack</label></div>
 				<br />
                 
              <!-- CCI Melee Weapon -->
               
-				<label class="sheet-long">Primary Melee Weapon</label><input type="text" name="attr_cciprimarymeleename" style="width:180px;" /><!--value="@{primarymeleename}" disabled="true"--> <br />
+				<label class="sheet-long">Primary Melee Weapon</label><input type="text" name="attr_cciprimarymeleename" style="width:180px;" value="@{primarymeleename}" disabled="true" /> <br />
 				<div class="sheet-baseinfo sheet-short"><input type="number" name="attr_cciprimarymeleeacc" class="sheet-short" value="@{primarymeleeacc}" disabled="true"  /><label>Acc</label></div>                
 				<div class="sheet-baseinfo sheet-short" style="margin-left:5px;"><input type="number" name="attr_cciprimarymeleereach" class="sheet-short" value="@{primarymeleereach}" disabled="true"  /><label>Reach</label></div>
 				<div class="sheet-baseinfo sheet-short"><input type="text" name="attr_cciprimarymeleedam" class="sheet-short" value="@{primarymeleedam}" disabled="true"  /><label>DV</label></div>
@@ -91,7 +91,7 @@
 				<div class="sheet-baseinfo sheet-short"><input type="number" name="attr_cciprimarymeleeskill" class="sheet-short" value="@{primarymeleeskill}" disabled="true"  /><label>Skill</label></div>
 				<div class="sheet-baseinfo" style="width:32px;">
 					<button type="roll" name="roll_cciattackmeleeprimary"
-						value="/em tries to hit something with his/her @{primarymeleename}! AP: [[@{primarymeleeap}]] || DV: [[@{primarymeleedam}]] || Acc: [[@{primarymeleeacc}]]\n/roll ([[@{primarymeleeskill}+@{agility}+?{Modifiers?|0}]]-@{woundmod})d6>5s"></button>
+						value="/em tries to hit something with their @{primarymeleename}! AP: [[@{primarymeleeap}]] || DV: [[@{primarymeleedam}]] || Acc: [[@{primarymeleeacc}]]\n/roll ([[@{primarymeleeskill}+@{agility}+?{Modifiers?|0}]]-@{woundmod})d6>5s"></button>
 				<label>Attack</label></div>                                
     
 			</div>    
@@ -276,7 +276,7 @@
               <fieldset class="repeating_activeskills">
                   <table> <tr>
                     <td><input type="text" name="attr_activeskillname" style="width:110px;" /></td>
-                    <td><!--<input type="number" name="attr_activeskillattr" style="width:35px;" /></td>-->
+                    <td>
                     <select name="attr_activeskillattr" style="width:60px; margin-bottom:-2px;">
 							  <option value="@{body}">BOD</option>
 							  <option value="@{agility}">AGI</option>
@@ -363,7 +363,7 @@
                   <div class="sheet-baseinfo" style="width:32px;"><input type="number" name="attr_primaryweaponskill" style="width:30px;" value="0" /><label>Skill</label></div>
                   <div class="sheet-baseinfo" style="width:32px;">
                     <button type="roll" name="roll_attackprimary"
-                            value="/em shoots his/her @{primaryweaponname}! AP: [[@{primaryweaponap}]] || DV: [[@{primaryweapondam}]] || Acc: [[@{primaryweaponacc}]]\n/roll ([[@{primaryweaponskill}+@{agility}+?{Modifiers?|0}]]-@{woundmod})d6>5s"></button>
+                            value="/em shoots their @{primaryweaponname}! AP: [[@{primaryweaponap}]] || DV: [[@{primaryweapondam}]] || Acc: [[@{primaryweaponacc}]]\n/roll ([[@{primaryweaponskill}+@{agility}+?{Modifiers?|0}]]-@{woundmod})d6>5s"></button>
                     <label>Attack</label></div>
                   
                   <!-- Secondary -->
@@ -387,7 +387,7 @@
                   <div class="sheet-baseinfo" style="width:32px;"><input type="number" name="attr_secondaryweaponskill" style="width:30px;" value="0" /><label>Skill</label></div>
                   <div class="sheet-baseinfo" style="width:32px;">
                     <button type="roll" name="roll_attacksecondary"
-                            value="/em shoots his/her @{secondaryweaponname}! AP: [[@{secondaryweaponap}]] || DV: [[@{secondaryweapondam}]] || Acc: [[@{secondaryweaponacc}]]\n/roll ([[@{secondaryweaponskill}+@{agility}+?{Modifiers?|0}]]-@{woundmod})d6>5s"></button>
+                            value="/em shoots their @{secondaryweaponname}! AP: [[@{secondaryweaponap}]] || DV: [[@{secondaryweapondam}]] || Acc: [[@{secondaryweaponacc}]]\n/roll ([[@{secondaryweaponskill}+@{agility}+?{Modifiers?|0}]]-@{woundmod})d6>5s"></button>
                     <label>Attack</label></div>
                   
                   <!-- Tertiary -->
@@ -411,7 +411,7 @@
                   <div class="sheet-baseinfo" style="width:32px;"><input type="number" name="attr_tertiaryweaponskill" style="width:30px;" value="0" /><label>Skill</label></div>
                   <div class="sheet-baseinfo" style="width:32px;">
                     <button type="roll" name="roll_attacktertiary"
-                            value="/em shoots his/her @{tertiaryweaponname}! AP: [[@{tertiaryweaponap}]] || DV: [[@{tertiaryweapondam}]] || Acc: [[@{tertiaryweaponacc}]]\n/roll ([[@{tertiaryweaponskill}+@{agility}+?{Modifiers?|0}]]-@{woundmod})d6>5s"></button>
+                            value="/em shoots their @{tertiaryweaponname}! AP: [[@{tertiaryweaponap}]] || DV: [[@{tertiaryweapondam}]] || Acc: [[@{tertiaryweaponacc}]]\n/roll ([[@{tertiaryweaponskill}+@{agility}+?{Modifiers?|0}]]-@{woundmod})d6>5s"></button>
                     <label>Attack</label></div>                
                   
                   <!-- Repeating -->                
@@ -436,7 +436,7 @@
                     <div class="sheet-baseinfo" style="width:32px;"><input type="number" name="attr_rangedskill" style="width:30px;" value="0" /><label>Skill</label></div>
                     <div class="sheet-baseinfo" style="width:32px;">
                     <button type="roll" name="roll_attackrep"
-                            value="/em shoots his/her @{repweaponname}! AP: [[@{repweaponap}]] || DV: [[@{repweapondam}]] || Acc: [[@{repweaponacc}]]\n/roll ([[@{repweaponskill}+@{agility}+?{Modifiers?|0}]]-@{woundmod})d6>5s"></button>
+                            value="/em shoots their @{repweaponname}! AP: [[@{repweaponap}]] || DV: [[@{repweapondam}]] || Acc: [[@{repweaponacc}]]\n/roll ([[@{repweaponskill}+@{agility}+?{Modifiers?|0}]]-@{woundmod})d6>5s"></button>
                     <label>Attack</label></div> 					
                     </fieldset>
                 </div>
@@ -459,7 +459,7 @@
                   <div class="sheet-baseinfo sheet-short"><input type="number" name="attr_primarymeleeskill" class="sheet-short" value="0" /><label>Skill</label></div>
                   <div class="sheet-baseinfo" style="width:32px;">
                     <button type="roll" name="roll_attackmeleeprimary"
-                            value="/em tries to hit something with his/her @{primarymeleename}! AP: [[@{primarymeleeap}]] || DV: [[@{primarymeleedam}]] || Acc: [[@{primarymeleeacc}]]\n/roll ([[@{primarymeleeskill}+@{agility}+?{Modifiers?|0}]]-@{woundmod})d6>5s"></button>
+                            value="/em tries to hit something with their @{primarymeleename}! AP: [[@{primarymeleeap}]] || DV: [[@{primarymeleedam}]] || Acc: [[@{primarymeleeacc}]]\n/roll ([[@{primarymeleeskill}+@{agility}+?{Modifiers?|0}]]-@{woundmod})d6>5s"></button>
                     <label>Attack</label></div>
                   
                   <!-- Secondary -->
@@ -471,7 +471,7 @@
                   <div class="sheet-baseinfo sheet-short"><input type="number" name="attr_secondarymeleeskill" class="sheet-short" value="0" /><label>Skill</label></div>
                   <div class="sheet-baseinfo" style="width:32px;">
                     <button type="roll" name="roll_attackmeleesecondary"
-                            value="/em tries to hit something with his/her @{secondarymeleename}! AP: [[@{secondarymeleeap}]] || DV: [[@{secondarymeleedam}]] || Acc: [[@{secondarymeleeacc}]]\n/roll ([[@{secondarymeleeskill}+@{agility}+?{Modifiers?|0}]]-@{woundmod})d6>5s"></button>
+                            value="/em tries to hit something with their @{secondarymeleename}! AP: [[@{secondarymeleeap}]] || DV: [[@{secondarymeleedam}]] || Acc: [[@{secondarymeleeacc}]]\n/roll ([[@{secondarymeleeskill}+@{agility}+?{Modifiers?|0}]]-@{woundmod})d6>5s"></button>
                     <label>Attack</label></div>
                   
                   <!-- Tertiary -->
@@ -483,7 +483,7 @@
                   <div class="sheet-baseinfo sheet-short"><input type="number" name="attr_tertiarymeleeskill" class="sheet-short" value="0" /><label>Skill</label></div>
                   <div class="sheet-baseinfo" style="width:32px;">
                     <button type="roll" name="roll_attackmeleetertiary"
-                            value="/em tries to hit something with his/her @{tertiarymeleename}! AP: [[@{tertiarymeleeap}]] || DV: [[@{tertiarymeleedam}]] || Acc: [[@{tertiarymeleeacc}]]\n/roll ([[@{tertiarymeleeskill}+@{agility}+?{Modifiers?|0}]]-@{woundmod})d6>5s"></button>
+                            value="/em tries to hit something with their @{tertiarymeleename}! AP: [[@{tertiarymeleeap}]] || DV: [[@{tertiarymeleedam}]] || Acc: [[@{tertiarymeleeacc}]]\n/roll ([[@{tertiarymeleeskill}+@{agility}+?{Modifiers?|0}]]-@{woundmod})d6>5s"></button>
                     <label>Attack</label></div>                                
                   
                   
@@ -497,7 +497,7 @@
                     <div class="sheet-baseinfo sheet-short"><input type="number" name="attr_meleeskill" class="sheet-short" value="0" /><label>Skill</label></div>
 					<div class="sheet-baseinfo" style="width:32px;">
                     <button type="roll" name="roll_attackmeleerep"
-                            value="/em tries to hit something with his/her @{repmeleename}! AP: [[@{repmeleeap}]] || DV: [[@{repmeleedam}]] || Acc: [[@{repmeleeacc}]]\n/roll ([[@{repmeleeskill}+@{agility}+?{Modifiers?|0}]]-@{woundmod})d6>5s"></button>
+                            value="/em tries to hit something with their @{repmeleename}! AP: [[@{repmeleeap}]] || DV: [[@{repmeleedam}]] || Acc: [[@{repmeleeacc}]]\n/roll ([[@{repmeleeskill}+@{agility}+?{Modifiers?|0}]]-@{woundmod})d6>5s"></button>
                     <label>Attack</label></div>
                     </fieldset>
                 </div>
@@ -734,4 +734,4 @@
     
     </div>
     
-</div>
+</div>
\ No newline at end of file