diff --git a/Shadowrun5th/Shadowrun5th.html b/Shadowrun5th/Shadowrun5th.html
index 438e20213a..f425eaa19e 100644
--- a/Shadowrun5th/Shadowrun5th.html
+++ b/Shadowrun5th/Shadowrun5th.html
@@ -587,22 +587,22 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                     <fieldset class="repeating_ammotype1">
                         <div class="ammorow">
                             <div class="ammonamewrapper">
-                                <input type="text" name="attr_ammoname1" title="Name of the Ammunition">
+                                <input type="text" name="attr_ammoname" title="Name of the Ammunition">
                             </div>
                             <div class="ammonumberwrapper">
-                                <input type="number" name="attr_ammonumber1" title="How many still left in the Clip/Drum/etc">
+                                <input type="number" name="attr_ammonumber" title="How many still left in the Clip/Drum/etc">
                             </div>
                             <div class="ammomaxwrapper">
-                                <input type="number" name="attr_ammomaxnumber1" title="Maximum Capacity of the Clip/Drum/etc">
+                                <input type="number" name="attr_ammomaxnumber" title="Maximum Capacity of the Clip/Drum/etc">
                             </div>
                             <div class="ammoaccwrapper">
-                                <input type="text" name="attr_ammoacc1" value="0" title="Accuracy change from the Ammunition">
+                                <input type="text" name="attr_ammoacc" value="0" title="Accuracy change from the Ammunition">
                             </div>
                             <div class="ammodvwrapper">
-                                <input type="text" name="attr_ammodv1" value="0" title="DV change from the Ammunition">
+                                <input type="text" name="attr_ammodv" value="0" title="DV change from the Ammunition">
                             </div>
                             <div class="ammodmgtypewrapper">
-                                <select name="attr_ammodmgtype1">
+                                <select name="attr_ammodmgtype">
                                     <option value="@{weapondmgtype1}">Weapon</option>
                                     <option value="P">Physical</option>
                                     <option value="S">Stun</option>
@@ -611,13 +611,13 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                                 </select>
                             </div>
                             <div class="ammoapwrapper">
-                                <input type="text" name="attr_ammoap1" value="0" title="AP change from the Ammunition">
+                                <input type="text" name="attr_ammoap" value="0" title="AP change from the Ammunition">
                             </div>
                             <div class="ammodescriptionwrapper">
-                                <input type="text" name="attr_ammodescription1" title="Additional Description">
+                                <input type="text" name="attr_ammodescription" title="Additional Description">
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+(@{prefix-ammoacc1})]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy1}+(@{prefix-ammoacc1})]]]]}}{{after1=AP([[@{weaponap1}+(@{prefix-ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{prefix-ammodv1})]]}}{{after1dmg=@{prefix-ammodmgtype1}}}{{after2=Simple: @{prefix-ammoname1} Rounds}}{{after2_num=[[@{weaponmode1}-floor(@{weaponmode1}/10)*10]]}}{{after3=Complex: @{prefix-ammoname1} Rounds}}{{after3_num=[[floor(@{weaponmode1}/10)]]}}{{description=@{prefix-ammodescription1}}}"></button>
+                                <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+(@{prefix-ammoacc})]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy1}+(@{prefix-ammoacc})]]]]}}{{after1=AP([[@{weaponap1}+(@{prefix-ammoap})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{prefix-ammodv})]]}}{{after1dmg=@{prefix-ammodmgtype}}}{{after2=Simple: @{prefix-ammoname} Rounds}}{{after2_num=[[@{weaponmode1}-floor(@{weaponmode1}/10)*10]]}}{{after3=Complex: @{prefix-ammoname} Rounds}}{{after3_num=[[floor(@{weaponmode1}/10)]]}}{{description=@{prefix-ammodescription}}}"></button>
                             </div>
                         </div>
                     </fieldset>
@@ -740,22 +740,22 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                     <fieldset class="repeating_ammotype2">
                         <div class="ammorow">
                             <div class="ammonamewrapper">
-                                <input type="text" name="attr_ammoname2" title="Name of the Ammunition">
+                                <input type="text" name="attr_ammoname" title="Name of the Ammunition">
                             </div>
                             <div class="ammonumberwrapper">
-                                <input type="number" name="attr_ammonumber2" title="How many still left in the Clip/Drum/etc">
+                                <input type="number" name="attr_ammonumber" title="How many still left in the Clip/Drum/etc">
                             </div>
                             <div class="ammomaxwrapper">
-                                <input type="number" name="attr_ammomaxnumber2" title="Maximum Capacity of the Clip/Drum/etc">
+                                <input type="number" name="attr_ammomaxnumber" title="Maximum Capacity of the Clip/Drum/etc">
                             </div>
                             <div class="ammoaccwrapper">
-                                <input type="text" name="attr_ammoacc2" value="0" title="Accuracy change from the Ammunition">
+                                <input type="text" name="attr_ammoacc" value="0" title="Accuracy change from the Ammunition">
                             </div>
                             <div class="ammodvwrapper">
-                                <input type="text" name="attr_ammodv2" value="0" title="DV change from the Ammunition">
+                                <input type="text" name="attr_ammodv" value="0" title="DV change from the Ammunition">
                             </div>
                             <div class="ammodmgtypewrapper">
-                                <select name="attr_ammodmgtype2">
+                                <select name="attr_ammodmgtype">
                                     <option value="@{weapondmgtype2}">Weapon</option>
                                     <option value="P">Physical</option>
                                     <option value="S">Stun</option>
@@ -764,13 +764,13 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                                 </select>
                             </div>
                             <div class="ammoapwrapper">
-                                <input type="text" name="attr_ammoap2" value="0" title="AP change from the Ammunition">
+                                <input type="text" name="attr_ammoap" value="0" title="AP change from the Ammunition">
                             </div>
                             <div class="ammodescriptionwrapper">
-                                <input type="text" name="attr_ammodescription2" title="Additional Description">
+                                <input type="text" name="attr_ammodescription" title="Additional Description">
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+(@{prefix-ammoacc2})]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy2}+(@{ammoacc2})]]]]}}{{after1=AP([[@{weaponap2}+(@{ammoap2})]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv2})]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=Simple: @{ammoname2} Rounds}}{{after2_num=[[@{weaponmode2}-floor(@{weaponmode2}/10)*10]]}}{{after3=Complex: @{ammoname2} Rounds}}{{after3_num=[[floor(@{weaponmode2}/10)]]}}{{description=@{ammodescription2}}}"></button>
+                                <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+(@{prefix-ammoacc})]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy2}+(@{ammoacc})]]]]}}{{after1=AP([[@{weaponap2}+(@{ammoap})]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv})]]}}{{after1dmg=@{prefix-ammodmgtype}}}{{after2=Simple: @{ammoname} Rounds}}{{after2_num=[[@{weaponmode2}-floor(@{weaponmode2}/10)*10]]}}{{after3=Complex: @{prefix-ammoname} Rounds}}{{after3_num=[[floor(@{weaponmode2}/10)]]}}{{description=@{ammodescription}}}"></button>
                             </div>
                         </div>
                     </fieldset>
@@ -893,22 +893,22 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                     <fieldset class="repeating_ammotype3">
                         <div class="ammorow">
                             <div class="ammonamewrapper">
-                                <input type="text" name="attr_ammoname3" title="Name of the Ammunition">
+                                <input type="text" name="attr_ammoname" title="Name of the Ammunition">
                             </div>
                             <div class="ammonumberwrapper">
-                                <input type="number" name="attr_ammonumber3" title="How many still left in the Clip/Drum/etc">
+                                <input type="number" name="attr_ammonumber" title="How many still left in the Clip/Drum/etc">
                             </div>
                             <div class="ammomaxwrapper">
-                                <input type="number" name="attr_ammomaxnumber3" title="Maximum Capacity of the Clip/Drum/etc">
+                                <input type="number" name="attr_ammomaxnumber" title="Maximum Capacity of the Clip/Drum/etc">
                             </div>
                             <div class="ammoaccwrapper">
-                                <input type="text" name="attr_ammoacc3" value="0" title="Accuracy change from the Ammunition">
+                                <input type="text" name="attr_ammoacc" value="0" title="Accuracy change from the Ammunition">
                             </div>
                             <div class="ammodvwrapper">
-                                <input type="text" name="attr_ammodv3" value="0" title="DV change from the Ammunition">
+                                <input type="text" name="attr_ammodv" value="0" title="DV change from the Ammunition">
                             </div>
                             <div class="ammodmgtypewrapper">
-                                <select name="attr_ammodmgtype3">
+                                <select name="attr_ammodmgtype">
                                     <option value="@{weapondmgtype3}">Weapon</option>
                                     <option value="P">Physical</option>
                                     <option value="S">Stun</option>
@@ -917,13 +917,13 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                                 </select>
                             </div>
                             <div class="ammoapwrapper">
-                                <input type="text" name="attr_ammoap3" value="0" title="AP change from the Ammunition">
+                                <input type="text" name="attr_ammoap" value="0" title="AP change from the Ammunition">
                             </div>
                             <div class="ammodescriptionwrapper">
-                                <input type="text" name="attr_ammodescription3" title="Additional Description">
+                                <input type="text" name="attr_ammodescription" title="Additional Description">
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+(@{prefix-ammoacc3})]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy3}+(@{prefix-ammoacc3})]]]]}}{{after1=AP([[@{weaponap3}+(@{prefix-ammoap3})]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{prefix-ammodv3})]]}}{{after1dmg=@{prefix-ammodmgtype3}}}{{after2=Simple: @{prefix-ammoname3} Rounds}}{{after2_num=[[@{weaponmode3}-floor(@{weaponmode3}/10)*10]]}}{{after3=Complex: @{prefix-ammoname3} Rounds}}{{after3_num=[[floor(@{weaponmode3}/10)]]}}{{description=@{prefix-ammodescription3}}}"></button>
+                                <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+(@{prefix-ammoacc})]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy3}+(@{prefix-ammoacc})]]]]}}{{after1=AP([[@{weaponap3}+(@{prefix-ammoap})]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{prefix-ammodv})]]}}{{after1dmg=@{prefix-ammodmgtype}}}{{after2=Simple: @{prefix-ammoname} Rounds}}{{after2_num=[[@{weaponmode3}-floor(@{weaponmode3}/10)*10]]}}{{after3=Complex: @{prefix-ammoname} Rounds}}{{after3_num=[[floor(@{weaponmode3}/10)]]}}{{description=@{prefix-ammodescription}}}"></button>
                             </div>
                         </div>
                     </fieldset>
@@ -1046,22 +1046,22 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                     <fieldset class="repeating_ammotype4">
                         <div class="ammorow">
                             <div class="ammonamewrapper">
-                                <input type="text" name="attr_ammoname4" title="Name of the Ammunition">
+                                <input type="text" name="attr_ammoname" title="Name of the Ammunition">
                             </div>
                             <div class="ammonumberwrapper">
-                                <input type="number" name="attr_ammonumber4" title="How many still left in the Clip/Drum/etc">
+                                <input type="number" name="attr_ammonumber" title="How many still left in the Clip/Drum/etc">
                             </div>
                             <div class="ammomaxwrapper">
-                                <input type="number" name="attr_ammomaxnumber4" title="Maximum Capacity of the Clip/Drum/etc">
+                                <input type="number" name="attr_ammomaxnumber" title="Maximum Capacity of the Clip/Drum/etc">
                             </div>
                             <div class="ammoaccwrapper">
-                                <input type="text" name="attr_ammoacc4" value="0" title="Accuracy change from the Ammunition">
+                                <input type="text" name="attr_ammoacc" value="0" title="Accuracy change from the Ammunition">
                             </div>
                             <div class="ammodvwrapper">
-                                <input type="text" name="attr_ammodv4" value="0" title="DV change from the Ammunition">
+                                <input type="text" name="attr_ammodv" value="0" title="DV change from the Ammunition">
                             </div>
                             <div class="ammodmgtypewrapper">
-                                <select name="attr_ammodmgtype4">
+                                <select name="attr_ammodmgtype">
                                     <option value="@{weapondmgtype4}">Weapon</option>
                                     <option value="P">Physical</option>
                                     <option value="S">Stun</option>
@@ -1070,13 +1070,13 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                                 </select>
                             </div>
                             <div class="ammoapwrapper">
-                                <input type="text" name="attr_ammoap4" value="0" title="AP change from the Ammunition">
+                                <input type="text" name="attr_ammoap" value="0" title="AP change from the Ammunition">
                             </div>
                             <div class="ammodescriptionwrapper">
-                                <input type="text" name="attr_ammodescription4" title="Additional Description">
+                                <input type="text" name="attr_ammodescription" title="Additional Description">
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+(@{prefix-ammoacc4})]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy4}+(@{prefix-ammoacc4})]]]]}}{{after1=AP([[@{weaponap4}+(@{prefix-ammoap4})]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{prefix-ammodv4})]]}}{{after1dmg=@{prefix-ammodmgtype4}}}{{after2=Simple: @{prefix-ammoname4} Rounds}}{{after2_num=[[@{weaponmode4}-floor(@{weaponmode4}/10)*10]]}}{{after3=Complex: @{prefix-ammoname4} Rounds}}{{after3_num=[[floor(@{weaponmode4}/10)]]}}{{description=@{prefix-ammodescription4}}}"></button>
+                                <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+(@{prefix-ammoacc})]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy4}+(@{prefix-ammoacc})]]]]}}{{after1=AP([[@{weaponap4}+(@{prefix-ammoap})]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{prefix-ammodv})]]}}{{after1dmg=@{prefix-ammodmgtype}}}{{after2=Simple: @{prefix-ammoname} Rounds}}{{after2_num=[[@{weaponmode4}-floor(@{weaponmode4}/10)*10]]}}{{after3=Complex: @{prefix-ammoname} Rounds}}{{after3_num=[[floor(@{weaponmode4}/10)]]}}{{description=@{prefix-ammodescription}}}"></button>
                             </div>
                         </div>
                     </fieldset>
@@ -1199,22 +1199,22 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                     <fieldset class="repeating_ammotype5">
                         <div class="ammorow">
                             <div class="ammonamewrapper">
-                                <input type="text" name="attr_ammoname5" title="Name of the Ammunition">
+                                <input type="text" name="attr_ammoname" title="Name of the Ammunition">
                             </div>
                             <div class="ammonumberwrapper">
-                                <input type="number" name="attr_ammonumber5" title="How many still left in the Clip/Drum/etc">
+                                <input type="number" name="attr_ammonumber" title="How many still left in the Clip/Drum/etc">
                             </div>
                             <div class="ammomaxwrapper">
-                                <input type="number" name="attr_ammomaxnumber5" title="Maximum Capacity of the Clip/Drum/etc">
+                                <input type="number" name="attr_ammomaxnumber" title="Maximum Capacity of the Clip/Drum/etc">
                             </div>
                             <div class="ammoaccwrapper">
-                                <input type="text" name="attr_ammoacc5" value="0" title="Accuracy change from the Ammunition">
+                                <input type="text" name="attr_ammoacc" value="0" title="Accuracy change from the Ammunition">
                             </div>
                             <div class="ammodvwrapper">
-                                <input type="text" name="attr_ammodv5" value="0" title="DV change from the Ammunition">
+                                <input type="text" name="attr_ammodv" value="0" title="DV change from the Ammunition">
                             </div>
                             <div class="ammodmgtypewrapper">
-                                <select name="attr_ammodmgtype5">
+                                <select name="attr_ammodmgtype">
                                     <option value="@{weapondmgtype5}">Weapon</option>
                                     <option value="P">Physical</option>
                                     <option value="S">Stun</option>
@@ -1223,13 +1223,13 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                                 </select>
                             </div>
                             <div class="ammoapwrapper">
-                                <input type="text" name="attr_ammoap5" value="0" title="AP change from the Ammunition">
+                                <input type="text" name="attr_ammoap" value="0" title="AP change from the Ammunition">
                             </div>
                             <div class="ammodescriptionwrapper">
-                                <input type="text" name="attr_ammodescription5" title="Additional Description">
+                                <input type="text" name="attr_ammodescription" title="Additional Description">
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+(@{prefix-ammoacc5})]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy5}+(@{prefix-ammoacc5})]]]]}}{{after1=AP([[@{weaponap5}+(@{prefix-ammoap5})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{prefix-ammodv5})]]}}{{after1dmg=@{prefix-ammodmgtype5}}}{{after2=Simpel: @{prefix-ammoname5} Rounds}}{{after2_num=[[@{weaponmode5}-floor(@{weaponmode5}/10)*10]]}}{{after3=Complex: @{prefix-ammoname5} Rounds}}{{after3_num=[[floor(@{weaponmode5}/10)]]}}{{description=@{prefix-ammodescription5}}}"></button>
+                                <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+(@{prefix-ammoacc})]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy5}+(@{prefix-ammoacc})]]]]}}{{after1=AP([[@{weaponap5}+(@{prefix-ammoap})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{prefix-ammodv})]]}}{{after1dmg=@{prefix-ammodmgtype}}}{{after2=Simpel: @{prefix-ammoname} Rounds}}{{after2_num=[[@{weaponmode5}-floor(@{weaponmode5}/10)*10]]}}{{after3=Complex: @{prefix-ammoname} Rounds}}{{after3_num=[[floor(@{weaponmode5}/10)]]}}{{description=@{prefix-ammodescription}}}"></button>
                             </div>
                         </div>
                     </fieldset>
@@ -1352,22 +1352,22 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                     <fieldset class="repeating_ammotype6">
                         <div class="ammorow">
                             <div class="ammonamewrapper">
-                                <input type="text" name="attr_ammoname6" title="Name of the Ammunition">
+                                <input type="text" name="attr_ammoname" title="Name of the Ammunition">
                             </div>
                             <div class="ammonumberwrapper">
-                                <input type="number" name="attr_ammonumber6" title="How many still left in the Clip/Drum/etc">
+                                <input type="number" name="attr_ammonumber" title="How many still left in the Clip/Drum/etc">
                             </div>
                             <div class="ammomaxwrapper">
-                                <input type="number" name="attr_ammomaxnumber6" title="Maximum Capacity of the Clip/Drum/etc">
+                                <input type="number" name="attr_ammomaxnumber" title="Maximum Capacity of the Clip/Drum/etc">
                             </div>
                             <div class="ammoaccwrapper">
-                                <input type="text" name="attr_ammoacc6" value="0" title="Accuracy change from the Ammunition">
+                                <input type="text" name="attr_ammoacc" value="0" title="Accuracy change from the Ammunition">
                             </div>
                             <div class="ammodvwrapper">
-                                <input type="text" name="attr_ammodv6" value="0" title="DV change from the Ammunition">
+                                <input type="text" name="attr_ammodv" value="0" title="DV change from the Ammunition">
                             </div>
                             <div class="ammodmgtypewrapper">
-                                <select name="attr_ammodmgtype6">
+                                <select name="attr_ammodmgtype">
                                     <option value="@{weapondmgtype6}">Weapon</option>
                                     <option value="P">Physical</option>
                                     <option value="S">Stun</option>
@@ -1376,13 +1376,13 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                                 </select>
                             </div>
                             <div class="ammoapwrapper">
-                                <input type="text" name="attr_ammoap6" value="0" title="AP change from the Ammunition">
+                                <input type="text" name="attr_ammoap" value="0" title="AP change from the Ammunition">
                             </div>
                             <div class="ammodescriptionwrapper">
-                                <input type="text" name="attr_ammodescription6" title="Additional Description">
+                                <input type="text" name="attr_ammodescription" title="Additional Description">
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+(@{prefix-ammoacc6})]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy6}+(@{prefix-ammoacc6})]]]]}}{{after1=AP([[@{weaponap6}+(@{prefix-ammoap6})]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{prefix-ammodv6})]]}}{{after1dmg=@{prefix-ammodmgtype6}}}{{after2=Simple: @{prefix-ammoname6} Rounds}}{{after2_num=[[@{weaponmode6}-floor(@{weaponmode6}/10)*10]]}}{{after3=Complex: @{prefix-ammoname6} Rounds}}{{after3_num=[[floor(@{weaponmode6}/10)]]}}{{description=@{prefix-ammodescription6}}}"></button>
+                                <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+(@{prefix-ammoacc})]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy6}+(@{prefix-ammoacc})]]]]}}{{after1=AP([[@{weaponap6}+(@{prefix-ammoap})]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{prefix-ammodv})]]}}{{after1dmg=@{prefix-ammodmgtype}}}{{after2=Simple: @{prefix-ammoname} Rounds}}{{after2_num=[[@{weaponmode6}-floor(@{weaponmode6}/10)*10]]}}{{after3=Complex: @{prefix-ammoname} Rounds}}{{after3_num=[[floor(@{weaponmode6}/10)]]}}{{description=@{prefix-ammodescription}}}"></button>
                             </div>
                         </div>
                     </fieldset>
@@ -1505,22 +1505,22 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                     <fieldset class="repeating_ammotype7">
                         <div class="ammorow">
                             <div class="ammonamewrapper">
-                                <input type="text" name="attr_ammoname7" title="Name of the Ammunition">
+                                <input type="text" name="attr_ammoname" title="Name of the Ammunition">
                             </div>
                             <div class="ammonumberwrapper">
-                                <input type="number" name="attr_ammonumber7" title="How many still left in the Clip/Drum/etc">
+                                <input type="number" name="attr_ammonumber" title="How many still left in the Clip/Drum/etc">
                             </div>
                             <div class="ammomaxwrapper">
-                                <input type="number" name="attr_ammomaxnumber7" title="Maximum Capacity of the Clip/Drum/etc">
+                                <input type="number" name="attr_ammomaxnumber" title="Maximum Capacity of the Clip/Drum/etc">
                             </div>
                             <div class="ammoaccwrapper">
-                                <input type="text" name="attr_ammoacc7" value="0" title="Accuracy change from the Ammunition">
+                                <input type="text" name="attr_ammoacc" value="0" title="Accuracy change from the Ammunition">
                             </div>
                             <div class="ammodvwrapper">
-                                <input type="text" name="attr_ammodv7" value="0" title="DV change from the Ammunition">
+                                <input type="text" name="attr_ammodv" value="0" title="DV change from the Ammunition">
                             </div>
                             <div class="ammodmgtypewrapper">
-                                <select name="attr_ammodmgtype7">
+                                <select name="attr_ammodmgtype">
                                     <option value="@{weapondmgtype7}">Weapon</option>
                                     <option value="P">Physical</option>
                                     <option value="S">Stun</option>
@@ -1529,13 +1529,13 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                                 </select>
                             </div>
                             <div class="ammoapwrapper">
-                                <input type="text" name="attr_ammoap7" value="0" title="AP change from the Ammunition">
+                                <input type="text" name="attr_ammoap" value="0" title="AP change from the Ammunition">
                             </div>
                             <div class="ammodescriptionwrapper">
-                                <input type="text" name="attr_ammodescription7" title="Additional Description">
+                                <input type="text" name="attr_ammodescription" title="Additional Description">
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}+(@{prefix-ammoacc7})]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy7}+(@{prefix-ammoacc7})]]]]}}{{after1=AP([[@{weaponap7}+(@{prefix-ammoap7})]]) ~ DV}}{{after1_num=[[@{weapondv7}+(@{prefix-ammodv7})]]}}{{after1dmg=@{prefix-ammodmgtype7}}}{{after2=Simple: @{prefix-ammoname7} Rounds}}{{after2_num=[[@{weaponmode7}-floor(@{weaponmode7}/10)*10]]}}{{after3=Complex: @{prefix-ammoname7} Rounds}}{{after3_num=[[floor(@{weaponmode7}/10)]]}}{{description=@{prefix-ammodescription7}}}"></button>
+                                <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}+(@{prefix-ammoacc})]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy7}+(@{prefix-ammoacc})]]]]}}{{after1=AP([[@{weaponap7}+(@{prefix-ammoap})]]) ~ DV}}{{after1_num=[[@{weapondv7}+(@{prefix-ammodv})]]}}{{after1dmg=@{prefix-ammodmgtype}}}{{after2=Simple: @{prefix-ammoname} Rounds}}{{after2_num=[[@{weaponmode7}-floor(@{weaponmode7}/10)*10]]}}{{after3=Complex: @{prefix-ammoname} Rounds}}{{after3_num=[[floor(@{weaponmode7}/10)]]}}{{description=@{prefix-ammodescription}}}"></button>
                             </div>
                         </div>
                     </fieldset>
@@ -1658,22 +1658,22 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                     <fieldset class="repeating_ammotype8">
                         <div class="ammorow">
                             <div class="ammonamewrapper">
-                                <input type="text" name="attr_ammoname8" title="Name of the Ammunition">
+                                <input type="text" name="attr_ammoname" title="Name of the Ammunition">
                             </div>
                             <div class="ammonumberwrapper">
-                                <input type="number" name="attr_ammonumber8" title="How many still left in the Clip/Drum/etc">
+                                <input type="number" name="attr_ammonumber" title="How many still left in the Clip/Drum/etc">
                             </div>
                             <div class="ammomaxwrapper">
-                                <input type="number" name="attr_ammomaxnumber8" title="Maximum Capacity of the Clip/Drum/etc">
+                                <input type="number" name="attr_ammomaxnumber" title="Maximum Capacity of the Clip/Drum/etc">
                             </div>
                             <div class="ammoaccwrapper">
-                                <input type="text" name="attr_ammoacc8" value="0" title="Accuracy change from the Ammunition">
+                                <input type="text" name="attr_ammoacc" value="0" title="Accuracy change from the Ammunition">
                             </div>
                             <div class="ammodvwrapper">
-                                <input type="text" name="attr_ammodv8" value="0" title="DV change from the Ammunition">
+                                <input type="text" name="attr_ammodv" value="0" title="DV change from the Ammunition">
                             </div>
                             <div class="ammodmgtypewrapper">
-                                <select name="attr_ammodmgtype8">
+                                <select name="attr_ammodmgtype">
                                     <option value="@{weapondmgtype8}">Weapon</option>
                                     <option value="P">Physical</option>
                                     <option value="S">Stun</option>
@@ -1682,13 +1682,13 @@ Can lift overhead (Strength + Nethits) x 5kg}}"></button>
                                 </select>
                             </div>
                             <div class="ammoapwrapper">
-                                <input type="text" name="attr_ammoap8" value="0" title="AP change from the Ammunition">
+                                <input type="text" name="attr_ammoap" value="0" title="AP change from the Ammunition">
                             </div>
                             <div class="ammodescriptionwrapper">
-                                <input type="text" name="attr_ammodescription8" title="Additional Description">
+                                <input type="text" name="attr_ammodescription" title="Additional Description">
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}+(@{prefix-ammoacc8})]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy8}+(@{prefix-ammoacc8})]]]]}}{{after1=AP([[@{weaponap8}+(@{prefix-ammoap8})]]) ~ DV}}{{after1_num=[[@{weapondv8}+(@{prefix-ammodv8})]]}}{{after1dmg=@{prefix-ammodmgtype8}}}{{after2=Simple: @{prefix-ammoname8} Rounds}}{{after2_num=[[@{weaponmode8}-floor(@{weaponmode8}/10)*10]]}}{{after3=Complex: @{prefix-ammoname8} Rounds}}{{after3_num=[[floor(@{weaponmode8}/10)]]}}{{description=@{prefix-ammodescription8}}}"></button>
+                                <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}+(@{prefix-ammoacc})]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy8}+(@{prefix-ammoacc})]]]]}}{{after1=AP([[@{weaponap8}+(@{prefix-ammoap})]]) ~ DV}}{{after1_num=[[@{weapondv8}+(@{prefix-ammodv})]]}}{{after1dmg=@{prefix-ammodmgtype}}}{{after2=Simple: @{prefix-ammoname} Rounds}}{{after2_num=[[@{weaponmode8}-floor(@{weaponmode8}/10)*10]]}}{{after3=Complex: @{prefix-ammoname} Rounds}}{{after3_num=[[floor(@{weaponmode8}/10)]]}}{{description=@{prefix-ammodescription}}}"></button>
                             </div>
                         </div>
                     </fieldset>
@@ -8530,22 +8530,22 @@ Click again to switch to Manual and Remote">
                 <fieldset class="repeating_ammotype1">
                     <div class="ammorow">
                         <div class="ammonamewrapper">
-                            <input type="text" name="attr_ammoname1" title="Name of the Ammunition">
+                            <input type="text" name="attr_ammoname" title="Name of the Ammunition">
                         </div>
                         <div class="ammonumberwrapper">
-                            <input type="number" name="attr_ammonumber1" title="How many still left in the Clip/Drum/etc">
+                            <input type="number" name="attr_ammonumber" title="How many still left in the Clip/Drum/etc">
                         </div>
                         <div class="ammomaxwrapper">
-                            <input type="number" name="attr_ammomaxnumber1" title="Maximum Capacity of the Clip/Drum/etc">
+                            <input type="number" name="attr_ammomaxnumber" title="Maximum Capacity of the Clip/Drum/etc">
                         </div>
                         <div class="ammoaccwrapper">
-                            <input type="text" name="attr_ammoacc1" value="0" title="Accuracy change from the Ammunition">
+                            <input type="text" name="attr_ammoacc" value="0" title="Accuracy change from the Ammunition">
                         </div>
                         <div class="ammodvwrapper">
-                            <input type="text" name="attr_ammodv1" value="0" title="DV change from the Ammunition">
+                            <input type="text" name="attr_ammodv" value="0" title="DV change from the Ammunition">
                         </div>
                         <div class="ammodmgtypewrapper">
-                            <select name="attr_ammodmgtype1">
+                            <select name="attr_ammodmgtype">
                                 <option value="@{weapondmgtype1}">Weapon</option>
                                 <option value="P">Physical</option>
                                 <option value="S">Stun</option>
@@ -8554,13 +8554,13 @@ Click again to switch to Manual and Remote">
                             </select>
                         </div>
                         <div class="ammoapwrapper">
-                            <input type="text" name="attr_ammoap1" value="0" title="AP change from the Ammunition">
+                            <input type="text" name="attr_ammoap" value="0" title="AP change from the Ammunition">
                         </div>
                         <div class="ammodescriptionwrapper">
-                            <input type="text" name="attr_ammodescription1" title="Additional Description">
+                            <input type="text" name="attr_ammodescription" title="Additional Description">
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+(@{prefix-ammoacc1})]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy1}+(@{prefix-ammoacc1})]]]]}}{{after1=AP([[@{weaponap1}+(@{prefix-ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{prefix-ammodv1})]]}}{{after1dmg=@{prefix-ammodmgtype1}}}{{after2=Simple: @{prefix-ammoname1} Rounds}}{{after2_num=[[@{weaponmode1}-floor(@{weaponmode1}/10)*10]]}}{{after3=Complex: @{prefix-ammoname1} Rounds}}{{after3_num=[[floor(@{weaponmode1}/10)]]}}{{description=@{prefix-ammodescription1}}}"></button>
+                            <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname1}}}{{val2_num=[[@{weaponcategory1}+@{weaponbonus1}+@{weaponspec1}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+(@{prefix-ammoacc})]]}}{{result=[[(@{weapondice1}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy1}+(@{prefix-ammoacc})]]]]}}{{after1=AP([[@{weaponap1}+(@{prefix-ammoap})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{prefix-ammodv})]]}}{{after1dmg=@{prefix-ammodmgtype}}}{{after2=Simple: @{prefix-ammoname} Rounds}}{{after2_num=[[@{weaponmode1}-floor(@{weaponmode1}/10)*10]]}}{{after3=Complex: @{prefix-ammoname} Rounds}}{{after3_num=[[floor(@{weaponmode1}/10)]]}}{{description=@{prefix-ammodescription}}}"></button>
                         </div>
                     </div>
                 </fieldset>
@@ -8676,22 +8676,22 @@ Click again to switch to Manual and Remote">
                 <fieldset class="repeating_ammotype2">
                     <div class="ammorow">
                         <div class="ammonamewrapper">
-                            <input type="text" name="attr_ammoname2" title="Name of the Ammunition">
+                            <input type="text" name="attr_ammoname" title="Name of the Ammunition">
                         </div>
                         <div class="ammonumberwrapper">
-                            <input type="number" name="attr_ammonumber2" title="How many still left in the Clip/Drum/etc">
+                            <input type="number" name="attr_ammonumber" title="How many still left in the Clip/Drum/etc">
                         </div>
                         <div class="ammomaxwrapper">
-                            <input type="number" name="attr_ammomaxnumber2" title="Maximum Capacity of the Clip/Drum/etc">
+                            <input type="number" name="attr_ammomaxnumber" title="Maximum Capacity of the Clip/Drum/etc">
                         </div>
                         <div class="ammoaccwrapper">
-                            <input type="text" name="attr_ammoacc2" value="0" title="Accuracy change from the Ammunition">
+                            <input type="text" name="attr_ammoacc" value="0" title="Accuracy change from the Ammunition">
                         </div>
                         <div class="ammodvwrapper">
-                            <input type="text" name="attr_ammodv2" value="0" title="DV change from the Ammunition">
+                            <input type="text" name="attr_ammodv" value="0" title="DV change from the Ammunition">
                         </div>
                         <div class="ammodmgtypewrapper">
-                            <select name="attr_ammodmgtype2">
+                            <select name="attr_ammodmgtype">
                                 <option value="@{weapondmgtype2}">Weapon</option>
                                 <option value="P">Physical</option>
                                 <option value="S">Stun</option>
@@ -8700,13 +8700,13 @@ Click again to switch to Manual and Remote">
                             </select>
                         </div>
                         <div class="ammoapwrapper">
-                            <input type="text" name="attr_ammoap2" value="0" title="AP change from the Ammunition">
+                            <input type="text" name="attr_ammoap" value="0" title="AP change from the Ammunition">
                         </div>
                         <div class="ammodescriptionwrapper">
-                            <input type="text" name="attr_ammodescription2" title="Additional Description">
+                            <input type="text" name="attr_ammodescription" title="Additional Description">
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+(@{prefix-ammoacc2})]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy2}+(@{prefix-ammoacc2})]]]]}}{{after1=AP([[@{weaponap2}+(@{prefix-ammoap2})]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{prefix-ammodv2})]]}}{{after1dmg=@{prefix-ammodmgtype2}}}{{after2=Simple: @{prefix-ammoname2} Rounds}}{{after2_num=[[@{weaponmode2}-floor(@{weaponmode2}/10)*10]]}}{{after3=Complex: @{prefix-ammoname2} Rounds}}{{after3_num=[[floor(@{weaponmode2}/10)]]}}{{description=@{prefix-ammodescription2}}}"></button>
+                            <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname2}}}{{val2_num=[[@{weaponcategory2}+@{weaponbonus2}+@{weaponspec2}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+(@{prefix-ammoacc})]]}}{{result=[[(@{weapondice2}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy2}+(@{prefix-ammoacc})]]]]}}{{after1=AP([[@{weaponap2}+(@{prefix-ammoap})]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{prefix-ammodv})]]}}{{after1dmg=@{prefix-ammodmgtype}}}{{after2=Simple: @{prefix-ammoname} Rounds}}{{after2_num=[[@{weaponmode2}-floor(@{weaponmode2}/10)*10]]}}{{after3=Complex: @{prefix-ammoname} Rounds}}{{after3_num=[[floor(@{weaponmode2}/10)]]}}{{description=@{prefix-ammodescription}}}"></button>
                         </div>
                     </div>
                 </fieldset>
@@ -8822,22 +8822,22 @@ Click again to switch to Manual and Remote">
                 <fieldset class="repeating_ammotype3">
                     <div class="ammorow">
                         <div class="ammonamewrapper">
-                            <input type="text" name="attr_ammoname3" title="Name of the Ammunition">
+                            <input type="text" name="attr_ammoname" title="Name of the Ammunition">
                         </div>
                         <div class="ammonumberwrapper">
-                            <input type="number" name="attr_ammonumber3" title="How many still left in the Clip/Drum/etc">
+                            <input type="number" name="attr_ammonumber" title="How many still left in the Clip/Drum/etc">
                         </div>
                         <div class="ammomaxwrapper">
-                            <input type="number" name="attr_ammomaxnumber3" title="Maximum Capacity of the Clip/Drum/etc">
+                            <input type="number" name="attr_ammomaxnumber" title="Maximum Capacity of the Clip/Drum/etc">
                         </div>
                         <div class="ammoaccwrapper">
-                            <input type="text" name="attr_ammoacc3" value="0" title="Accuracy change from the Ammunition">
+                            <input type="text" name="attr_ammoacc" value="0" title="Accuracy change from the Ammunition">
                         </div>
                         <div class="ammodvwrapper">
-                            <input type="text" name="attr_ammodv3" value="0" title="DV change from the Ammunition">
+                            <input type="text" name="attr_ammodv" value="0" title="DV change from the Ammunition">
                         </div>
                         <div class="ammodmgtypewrapper">
-                            <select name="attr_ammodmgtype3">
+                            <select name="attr_ammodmgtype">
                                 <option value="@{weapondmgtype3}">Weapon</option>
                                 <option value="P">Physical</option>
                                 <option value="S">Stun</option>
@@ -8846,13 +8846,13 @@ Click again to switch to Manual and Remote">
                             </select>
                         </div>
                         <div class="ammoapwrapper">
-                            <input type="text" name="attr_ammoap3" value="0" title="AP change from the Ammunition">
+                            <input type="text" name="attr_ammoap" value="0" title="AP change from the Ammunition">
                         </div>
                         <div class="ammodescriptionwrapper">
-                            <input type="text" name="attr_ammodescription3" title="Additional Description">
+                            <input type="text" name="attr_ammodescription" title="Additional Description">
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+(@{prefix-ammoacc3})]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy3}+(@{prefix-ammoacc3})]]]]}}{{after1=AP([[@{weaponap3}+(@{prefix-ammoap3})]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{prefix-ammodv3})]]}}{{after1dmg=@{prefix-ammodmgtype3}}}{{after2=Simple: @{prefix-ammoname3} Rounds}}{{after2_num=[[@{weaponmode3}-floor(@{weaponmode3}/10)*10]]}}{{after3=Complex: @{prefix-ammoname3} Rounds}}{{after3_num=[[floor(@{weaponmode3}/10)]]}}{{description=@{prefix-ammodescription3}}}"></button>
+                            <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname3}}}{{val2_num=[[@{weaponcategory3}+@{weaponbonus3}+@{weaponspec3}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+(@{prefix-ammoacc})]]}}{{result=[[(@{weapondice3}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy3}+(@{prefix-ammoacc})]]]]}}{{after1=AP([[@{weaponap3}+(@{prefix-ammoap})]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{prefix-ammodv})]]}}{{after1dmg=@{prefix-ammodmgtype}}}{{after2=Simple: @{prefix-ammoname} Rounds}}{{after2_num=[[@{weaponmode3}-floor(@{weaponmode3}/10)*10]]}}{{after3=Complex: @{prefix-ammoname} Rounds}}{{after3_num=[[floor(@{weaponmode3}/10)]]}}{{description=@{prefix-ammodescription}}}"></button>
                         </div>
                     </div>
                 </fieldset>
@@ -8968,22 +8968,22 @@ Click again to switch to Manual and Remote">
                 <fieldset class="repeating_ammotype4">
                     <div class="ammorow">
                         <div class="ammonamewrapper">
-                            <input type="text" name="attr_ammoname4" title="Name of the Ammunition">
+                            <input type="text" name="attr_ammoname" title="Name of the Ammunition">
                         </div>
                         <div class="ammonumberwrapper">
-                            <input type="number" name="attr_ammonumber4" title="How many still left in the Clip/Drum/etc">
+                            <input type="number" name="attr_ammonumber" title="How many still left in the Clip/Drum/etc">
                         </div>
                         <div class="ammomaxwrapper">
-                            <input type="number" name="attr_ammomaxnumber4" title="Maximum Capacity of the Clip/Drum/etc">
+                            <input type="number" name="attr_ammomaxnumber" title="Maximum Capacity of the Clip/Drum/etc">
                         </div>
                         <div class="ammoaccwrapper">
-                            <input type="text" name="attr_ammoacc4" value="0" title="Accuracy change from the Ammunition">
+                            <input type="text" name="attr_ammoacc" value="0" title="Accuracy change from the Ammunition">
                         </div>
                         <div class="ammodvwrapper">
-                            <input type="text" name="attr_ammodv4" value="0" title="DV change from the Ammunition">
+                            <input type="text" name="attr_ammodv" value="0" title="DV change from the Ammunition">
                         </div>
                         <div class="ammodmgtypewrapper">
-                            <select name="attr_ammodmgtype4">
+                            <select name="attr_ammodmgtype">
                                 <option value="@{weapondmgtype4}">Weapon</option>
                                 <option value="P">Physical</option>
                                 <option value="S">Stun</option>
@@ -8992,13 +8992,13 @@ Click again to switch to Manual and Remote">
                             </select>
                         </div>
                         <div class="ammoapwrapper">
-                            <input type="text" name="attr_ammoap4" value="0" title="AP change from the Ammunition">
+                            <input type="text" name="attr_ammoap" value="0" title="AP change from the Ammunition">
                         </div>
                         <div class="ammodescriptionwrapper">
-                            <input type="text" name="attr_ammodescription4" title="Additional Description">
+                            <input type="text" name="attr_ammodescription" title="Additional Description">
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+(@{prefix-ammoacc4})]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy4}+(@{prefix-ammoacc4})]]]]}}{{after1=AP([[@{weaponap4}+(@{prefix-ammoap4})]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{prefix-ammodv4})]]}}{{after1dmg=@{prefix-ammodmgtype4}}}{{after2=Simple: @{prefix-ammoname4} Rounds}}{{after2_num=[[@{weaponmode4}-floor(@{weaponmode4}/10)*10]]}}{{after3=Complex: @{prefix-ammoname4} Rounds}}{{after3_num=[[floor(@{weaponmode4}/10)]]}}{{description=@{prefix-ammodescription4}}}"></button>
+                            <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname4}}}{{val2_num=[[@{weaponcategory4}+@{weaponbonus4}+@{weaponspec4}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+(@{prefix-ammoacc})]]}}{{result=[[(@{weapondice4}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy4}+(@{prefix-ammoacc})]]]]}}{{after1=AP([[@{weaponap4}+(@{prefix-ammoap})]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{prefix-ammodv})]]}}{{after1dmg=@{prefix-ammodmgtype}}}{{after2=Simple: @{prefix-ammoname} Rounds}}{{after2_num=[[@{weaponmode4}-floor(@{weaponmode4}/10)*10]]}}{{after3=Complex: @{prefix-ammoname} Rounds}}{{after3_num=[[floor(@{weaponmode4}/10)]]}}{{description=@{prefix-ammodescription}}}"></button>
                         </div>
                     </div>
                 </fieldset>
@@ -9114,22 +9114,22 @@ Click again to switch to Manual and Remote">
                 <fieldset class="repeating_ammotype5">
                     <div class="ammorow">
                         <div class="ammonamewrapper">
-                            <input type="text" name="attr_ammoname5" title="Name of the Ammunition">
+                            <input type="text" name="attr_ammoname" title="Name of the Ammunition">
                         </div>
                         <div class="ammonumberwrapper">
-                            <input type="number" name="attr_ammonumber5" title="How many still left in the Clip/Drum/etc">
+                            <input type="number" name="attr_ammonumber" title="How many still left in the Clip/Drum/etc">
                         </div>
                         <div class="ammomaxwrapper">
-                            <input type="number" name="attr_ammomaxnumber5" title="Maximum Capacity of the Clip/Drum/etc">
+                            <input type="number" name="attr_ammomaxnumber" title="Maximum Capacity of the Clip/Drum/etc">
                         </div>
                         <div class="ammoaccwrapper">
-                            <input type="text" name="attr_ammoacc5" value="0" title="Accuracy change from the Ammunition">
+                            <input type="text" name="attr_ammoacc" value="0" title="Accuracy change from the Ammunition">
                         </div>
                         <div class="ammodvwrapper">
-                            <input type="text" name="attr_ammodv5" value="0" title="DV change from the Ammunition">
+                            <input type="text" name="attr_ammodv" value="0" title="DV change from the Ammunition">
                         </div>
                         <div class="ammodmgtypewrapper">
-                            <select name="attr_ammodmgtype5">
+                            <select name="attr_ammodmgtype">
                                 <option value="@{weapondmgtype5}">Weapon</option>
                                 <option value="P">Physical</option>
                                 <option value="S">Stun</option>
@@ -9138,13 +9138,13 @@ Click again to switch to Manual and Remote">
                             </select>
                         </div>
                         <div class="ammoapwrapper">
-                            <input type="text" name="attr_ammoap5" value="0" title="AP change from the Ammunition">
+                            <input type="text" name="attr_ammoap" value="0" title="AP change from the Ammunition">
                         </div>
                         <div class="ammodescriptionwrapper">
-                            <input type="text" name="attr_ammodescription5" title="Additional Description">
+                            <input type="text" name="attr_ammodescription" title="Additional Description">
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+(@{prefix-ammoacc5})]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy5}+(@{prefix-ammoacc5})]]]]}}{{after1=AP([[@{weaponap5}+(@{prefix-ammoap5})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{prefix-ammodv5})]]}}{{after1dmg=@{prefix-ammodmgtype5}}}{{after2=Simpel: @{prefix-ammoname5} Rounds}}{{after2_num=[[@{weaponmode5}-floor(@{weaponmode5}/10)*10]]}}{{after3=Complex: @{prefix-ammoname5} Rounds}}{{after3_num=[[floor(@{weaponmode5}/10)]]}}{{description=@{prefix-ammodescription5}}}"></button>
+                            <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname5}}}{{val2_num=[[@{weaponcategory5}+@{weaponbonus5}+@{weaponspec5}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+(@{prefix-ammoacc})]]}}{{result=[[(@{weapondice5}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy5}+(@{prefix-ammoacc})]]]]}}{{after1=AP([[@{weaponap5}+(@{prefix-ammoap})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{prefix-ammodv})]]}}{{after1dmg=@{prefix-ammodmgtype}}}{{after2=Simpel: @{prefix-ammoname} Rounds}}{{after2_num=[[@{weaponmode5}-floor(@{weaponmode5}/10)*10]]}}{{after3=Complex: @{prefix-ammoname} Rounds}}{{after3_num=[[floor(@{weaponmode5}/10)]]}}{{description=@{prefix-ammodescription}}}"></button>
                         </div>
                     </div>
                 </fieldset>
@@ -9260,22 +9260,22 @@ Click again to switch to Manual and Remote">
                 <fieldset class="repeating_ammotype6">
                     <div class="ammorow">
                         <div class="ammonamewrapper">
-                            <input type="text" name="attr_ammoname6" title="Name of the Ammunition">
+                            <input type="text" name="attr_ammoname" title="Name of the Ammunition">
                         </div>
                         <div class="ammonumberwrapper">
-                            <input type="number" name="attr_ammonumber6" title="How many still left in the Clip/Drum/etc">
+                            <input type="number" name="attr_ammonumber" title="How many still left in the Clip/Drum/etc">
                         </div>
                         <div class="ammomaxwrapper">
-                            <input type="number" name="attr_ammomaxnumber6" title="Maximum Capacity of the Clip/Drum/etc">
+                            <input type="number" name="attr_ammomaxnumber" title="Maximum Capacity of the Clip/Drum/etc">
                         </div>
                         <div class="ammoaccwrapper">
-                            <input type="text" name="attr_ammoacc6" value="0" title="Accuracy change from the Ammunition">
+                            <input type="text" name="attr_ammoacc" value="0" title="Accuracy change from the Ammunition">
                         </div>
                         <div class="ammodvwrapper">
-                            <input type="text" name="attr_ammodv6" value="0" title="DV change from the Ammunition">
+                            <input type="text" name="attr_ammodv" value="0" title="DV change from the Ammunition">
                         </div>
                         <div class="ammodmgtypewrapper">
-                            <select name="attr_ammodmgtype6">
+                            <select name="attr_ammodmgtype">
                                 <option value="@{weapondmgtype6}">Weapon</option>
                                 <option value="P">Physical</option>
                                 <option value="S">Stun</option>
@@ -9284,13 +9284,13 @@ Click again to switch to Manual and Remote">
                             </select>
                         </div>
                         <div class="ammoapwrapper">
-                            <input type="text" name="attr_ammoap6" value="0" title="AP change from the Ammunition">
+                            <input type="text" name="attr_ammoap" value="0" title="AP change from the Ammunition">
                         </div>
                         <div class="ammodescriptionwrapper">
-                            <input type="text" name="attr_ammodescription6" title="Additional Description">
+                            <input type="text" name="attr_ammodescription" title="Additional Description">
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+(@{prefix-ammoacc6})]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy6}+(@{prefix-ammoacc6})]]]]}}{{after1=AP([[@{weaponap6}+(@{prefix-ammoap6})]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{prefix-ammodv6})]]}}{{after1dmg=@{prefix-ammodmgtype6}}}{{after2=Simple: @{prefix-ammoname6} Rounds}}{{after2_num=[[@{weaponmode6}-floor(@{weaponmode6}/10)*10]]}}{{after3=Complex: @{prefix-ammoname6} Rounds}}{{after3_num=[[floor(@{weaponmode6}/10)]]}}{{description=@{prefix-ammodescription6}}}"></button>
+                            <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname6}}}{{val2_num=[[@{weaponcategory6}+@{weaponbonus6}+@{weaponspec6}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+(@{prefix-ammoacc})]]}}{{result=[[(@{weapondice6}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy6}+(@{prefix-ammoacc})]]]]}}{{after1=AP([[@{weaponap6}+(@{prefix-ammoap})]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{prefix-ammodv})]]}}{{after1dmg=@{prefix-ammodmgtype}}}{{after2=Simple: @{prefix-ammoname} Rounds}}{{after2_num=[[@{weaponmode6}-floor(@{weaponmode6}/10)*10]]}}{{after3=Complex: @{prefix-ammoname} Rounds}}{{after3_num=[[floor(@{weaponmode6}/10)]]}}{{description=@{prefix-ammodescription}}}"></button>
                         </div>
                     </div>
                 </fieldset>
@@ -9406,22 +9406,22 @@ Click again to switch to Manual and Remote">
                 <fieldset class="repeating_ammotype7">
                     <div class="ammorow">
                         <div class="ammonamewrapper">
-                            <input type="text" name="attr_ammoname7" title="Name of the Ammunition">
+                            <input type="text" name="attr_ammoname" title="Name of the Ammunition">
                         </div>
                         <div class="ammonumberwrapper">
-                            <input type="number" name="attr_ammonumber7" title="How many still left in the Clip/Drum/etc">
+                            <input type="number" name="attr_ammonumber" title="How many still left in the Clip/Drum/etc">
                         </div>
                         <div class="ammomaxwrapper">
-                            <input type="number" name="attr_ammomaxnumber7" title="Maximum Capacity of the Clip/Drum/etc">
+                            <input type="number" name="attr_ammomaxnumber" title="Maximum Capacity of the Clip/Drum/etc">
                         </div>
                         <div class="ammoaccwrapper">
-                            <input type="text" name="attr_ammoacc7" value="0" title="Accuracy change from the Ammunition">
+                            <input type="text" name="attr_ammoacc" value="0" title="Accuracy change from the Ammunition">
                         </div>
                         <div class="ammodvwrapper">
-                            <input type="text" name="attr_ammodv7" value="0" title="DV change from the Ammunition">
+                            <input type="text" name="attr_ammodv" value="0" title="DV change from the Ammunition">
                         </div>
                         <div class="ammodmgtypewrapper">
-                            <select name="attr_ammodmgtype7">
+                            <select name="attr_ammodmgtype">
                                 <option value="@{weapondmgtype7}">Weapon</option>
                                 <option value="P">Physical</option>
                                 <option value="S">Stun</option>
@@ -9430,13 +9430,13 @@ Click again to switch to Manual and Remote">
                             </select>
                         </div>
                         <div class="ammoapwrapper">
-                            <input type="text" name="attr_ammoap7" value="0" title="AP change from the Ammunition">
+                            <input type="text" name="attr_ammoap" value="0" title="AP change from the Ammunition">
                         </div>
                         <div class="ammodescriptionwrapper">
-                            <input type="text" name="attr_ammodescription7" title="Additional Description">
+                            <input type="text" name="attr_ammodescription" title="Additional Description">
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}+(@{prefix-ammoacc7})]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy7}+(@{prefix-ammoacc7})]]]]}}{{after1=AP([[@{weaponap7}+(@{prefix-ammoap7})]]) ~ DV}}{{after1_num=[[@{weapondv7}+(@{prefix-ammodv7})]]}}{{after1dmg=@{prefix-ammodmgtype7}}}{{after2=Simple: @{prefix-ammoname7} Rounds}}{{after2_num=[[@{weaponmode7}-floor(@{weaponmode7}/10)*10]]}}{{after3=Complex: @{prefix-ammoname7} Rounds}}{{after3_num=[[floor(@{weaponmode7}/10)]]}}{{description=@{prefix-ammodescription7}}}"></button>
+                            <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname7}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname7}}}{{val2_num=[[@{weaponcategory7}+@{weaponbonus7}+@{weaponspec7}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc7}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy7}+(@{prefix-ammoacc})]]}}{{result=[[(@{weapondice7}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy7}+(@{prefix-ammoacc})]]]]}}{{after1=AP([[@{weaponap7}+(@{prefix-ammoap})]]) ~ DV}}{{after1_num=[[@{weapondv7}+(@{prefix-ammodv})]]}}{{after1dmg=@{prefix-ammodmgtype}}}{{after2=Simple: @{prefix-ammoname} Rounds}}{{after2_num=[[@{weaponmode7}-floor(@{weaponmode7}/10)*10]]}}{{after3=Complex: @{prefix-ammoname} Rounds}}{{after3_num=[[floor(@{weaponmode7}/10)]]}}{{description=@{prefix-ammodescription}}}"></button>
                         </div>
                     </div>
                 </fieldset>
@@ -9552,22 +9552,22 @@ Click again to switch to Manual and Remote">
                 <fieldset class="repeating_ammotype8">
                     <div class="ammorow">
                         <div class="ammonamewrapper">
-                            <input type="text" name="attr_ammoname8" title="Name of the Ammunition">
+                            <input type="text" name="attr_ammoname" title="Name of the Ammunition">
                         </div>
                         <div class="ammonumberwrapper">
-                            <input type="number" name="attr_ammonumber8" title="How many still left in the Clip/Drum/etc">
+                            <input type="number" name="attr_ammonumber" title="How many still left in the Clip/Drum/etc">
                         </div>
                         <div class="ammomaxwrapper">
-                            <input type="number" name="attr_ammomaxnumber8" title="Maximum Capacity of the Clip/Drum/etc">
+                            <input type="number" name="attr_ammomaxnumber" title="Maximum Capacity of the Clip/Drum/etc">
                         </div>
                         <div class="ammoaccwrapper">
-                            <input type="text" name="attr_ammoacc8" value="0" title="Accuracy change from the Ammunition">
+                            <input type="text" name="attr_ammoacc" value="0" title="Accuracy change from the Ammunition">
                         </div>
                         <div class="ammodvwrapper">
-                            <input type="text" name="attr_ammodv8" value="0" title="DV change from the Ammunition">
+                            <input type="text" name="attr_ammodv" value="0" title="DV change from the Ammunition">
                         </div>
                         <div class="ammodmgtypewrapper">
-                            <select name="attr_ammodmgtype8">
+                            <select name="attr_ammodmgtype">
                                 <option value="@{weapondmgtype8}">Weapon</option>
                                 <option value="P">Physical</option>
                                 <option value="S">Stun</option>
@@ -9576,13 +9576,13 @@ Click again to switch to Manual and Remote">
                             </select>
                         </div>
                         <div class="ammoapwrapper">
-                            <input type="text" name="attr_ammoap8" value="0" title="AP change from the Ammunition">
+                            <input type="text" name="attr_ammoap" value="0" title="AP change from the Ammunition">
                         </div>
                         <div class="ammodescriptionwrapper">
-                            <input type="text" name="attr_ammodescription8" title="Additional Description">
+                            <input type="text" name="attr_ammodescription" title="Additional Description">
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}+(@{prefix-ammoacc8})]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy8}+(@{prefix-ammoacc8})]]]]}}{{after1=AP([[@{weaponap8}+(@{prefix-ammoap8})]]) ~ DV}}{{after1_num=[[@{weapondv8}+(@{prefix-ammodv8})]]}}{{after1dmg=@{prefix-ammodmgtype8}}}{{after2=Simple: @{prefix-ammoname8} Rounds}}{{after2_num=[[@{weaponmode8}-floor(@{weaponmode8}/10)*10]]}}{{after3=Complex: @{prefix-ammoname8} Rounds}}{{after3_num=[[floor(@{weaponmode8}/10)]]}}{{description=@{prefix-ammodescription8}}}"></button>
+                            <button type="action" class="ammoroll" name="act_roll" title="Fire the Weapon with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname8}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponskillname8}}}{{val2_num=[[@{weaponcategory8}+@{weaponbonus8}+@{weaponspec8}-(@{agi_total})]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc8}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy8}+(@{prefix-ammoacc})]]}}{{result=[[(@{weapondice8}+?{Situational Modifiers|0}-[[@{wound_total}]]-[[@{sustainedspells}*2]]+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[@{weaponaccuracy8}+(@{prefix-ammoacc})]]]]}}{{after1=AP([[@{weaponap8}+(@{prefix-ammoap})]]) ~ DV}}{{after1_num=[[@{weapondv8}+(@{prefix-ammodv})]]}}{{after1dmg=@{prefix-ammodmgtype}}}{{after2=Simple: @{prefix-ammoname} Rounds}}{{after2_num=[[@{weaponmode8}-floor(@{weaponmode8}/10)*10]]}}{{after3=Complex: @{prefix-ammoname} Rounds}}{{after3_num=[[floor(@{weaponmode8}/10)]]}}{{description=@{prefix-ammodescription}}}"></button>
                         </div>
                     </div>
                 </fieldset>
@@ -11505,6 +11505,9 @@ on("change:chummercheckbox", function(){
                                         attributes["weaponap"+i]=0;
                                     }else{
                                         attributes["weaponap"+i]=chummerfile.characters.character.weapons.weapon[i-1].ap;
+                                        if(chummerfile.characters.character.weapons.weapon[i-1].rawap != null) {
+                                            attributes["weaponap"+i]=chummerfile.characters.character.weapons.weapon[i-1].rawap;
+                                        }
                                     }
                                     attributes["weaponnotes"+i]="";
 
@@ -11531,28 +11534,28 @@ on("change:chummercheckbox", function(){
                                                 //find ammo to get stats
                                                 ammo = ammunition.find(clip => clip.guid === chummerfile.characters.character.weapons.weapon[i-1].clips.clip[j].id);
                                                 if(ammo != null) {
-                                                    attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoname"+i]=ammo.name;
+                                                    attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoname"]=ammo.name;
                                                     if(ammo.weaponbonusdamage_english != null && ammo.weaponbonusap != null && ammo.weaponbonusacc != null) {
-                                                        attributes["repeating_ammotype"+i+"_"+newrowid+"_ammodv"+i]=ammo.weaponbonusdamage_english.substring(0,2);
-                                                        attributes["repeating_ammotype"+i+"_"+newrowid+"_ammodmgtype"+i]=ammo.weaponbonusdamage_english.substring(2);
+                                                        attributes["repeating_ammotype"+i+"_"+newrowid+"_ammodv"]=ammo.weaponbonusdamage_english.substring(0,2);
+                                                        attributes["repeating_ammotype"+i+"_"+newrowid+"_ammodmgtype"]=ammo.weaponbonusdamage_english.substring(2);
                                                         if(ammo.name_english === "Ammo: Stick-n-Shock") {
-                                                            attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoap"+i] = -5 - attributes["weaponap"+i]
+                                                            attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoap"] = -5 - attributes["weaponap"+i]
                                                         }
                                                         else {
-                                                            attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoap"+i]=ammo.weaponbonusap;
+                                                            attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoap"]=ammo.weaponbonusap;
                                                         }
-                                                        attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoacc"+i]=ammo.weaponbonusacc;
+                                                        attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoacc"]=ammo.weaponbonusacc;
                                                     }
                                                     else {
-                                                        attributes["repeating_ammotype"+i+"_"+newrowid+"_ammodv"+i]=0;
-                                                        attributes["repeating_ammotype"+i+"_"+newrowid+"_ammodmgtype"+i]=0;
+                                                        attributes["repeating_ammotype"+i+"_"+newrowid+"_ammodv"]=0;
+                                                        attributes["repeating_ammotype"+i+"_"+newrowid+"_ammodmgtype"]=0;
                                                         if(ammo.name_english === "Ammo: Stick-n-Shock") {
-                                                            attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoap"+i] = -5 - attributes["weaponap"+i]
+                                                            attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoap"] = -5 - attributes["weaponap"+i]
                                                         }
                                                         else {
-                                                            attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoap"+i]=0;
+                                                            attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoap"]=0;
                                                         }
-                                                        attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoacc"+i]=0;
+                                                        attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoacc"]=0;
                                                     }
                                                 }
                                             }
@@ -11567,28 +11570,28 @@ on("change:chummercheckbox", function(){
                                             }
 
                                             if(ammo != null) {
-                                                attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoname"+i]=ammo.name;
+                                                attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoname"]=ammo.name;
                                                 if(ammo.weaponbonusdamage_english != null && ammo.weaponbonusap != null && ammo.weaponbonusacc != null)  {
-                                                        attributes["repeating_ammotype"+i+"_"+newrowid+"_ammodv"+i]=ammo.weaponbonusdamage_english.substring(0,2);
-                                                        attributes["repeating_ammotype"+i+"_"+newrowid+"_ammodmgtype"+i]=ammo.weaponbonusdamage_english.substring(2);
+                                                        attributes["repeating_ammotype"+i+"_"+newrowid+"_ammodv"]=ammo.weaponbonusdamage_english.substring(0,2);
+                                                        attributes["repeating_ammotype"+i+"_"+newrowid+"_ammodmgtype"]=ammo.weaponbonusdamage_english.substring(2);
                                                         if(ammo.name_english === "Ammo: Stick-n-Shock") {
-                                                            attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoap"+i] = -5 - attributes["weaponap"+i]
+                                                            attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoap"] = -5 - attributes["weaponap"+i]
                                                         }
                                                         else {
-                                                            attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoap"+i]=ammo.weaponbonusap;
+                                                            attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoap"]=ammo.weaponbonusap;
                                                         }
-                                                        attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoacc"+i]=ammo.weaponbonusacc;
+                                                        attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoacc"]=ammo.weaponbonusacc;
                                                 }
                                                 else {
-                                                        attributes["repeating_ammotype"+i+"_"+newrowid+"_ammodv"+i]=0;
-                                                        attributes["repeating_ammotype"+i+"_"+newrowid+"_ammodmgtype"+i]=0;
+                                                        attributes["repeating_ammotype"+i+"_"+newrowid+"_ammodv"]=0;
+                                                        attributes["repeating_ammotype"+i+"_"+newrowid+"_ammodmgtype"]=0;
                                                         if(ammo.name_english === "Ammo: Stick-n-Shock") {
-                                                            attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoap"+i] = -5 - attributes["weaponap"+i]
+                                                            attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoap"] = -5 - attributes["weaponap"+i]
                                                         }
                                                         else {
-                                                            attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoap"+i]=0;
+                                                            attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoap"]=0;
                                                         }
-                                                        attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoacc"+i]=0;
+                                                        attributes["repeating_ammotype"+i+"_"+newrowid+"_ammoacc"]=0;
                                                 }
                                             }
                                         }