diff --git a/Shadowrun5th/Shadowrun5th.css b/Shadowrun5th/Shadowrun5th.css
index 64ba3009d7..b13b2009ca 100644
--- a/Shadowrun5th/Shadowrun5th.css
+++ b/Shadowrun5th/Shadowrun5th.css
@@ -249,6 +249,8 @@ input.sheet-technomancycheckbox:checked ~ label.sheet-labeltechnomancer{
 .sheet-contactscheckbox:checked ~ div.sheet-contactsticked,
 .sheet-qualityunticked,
 .sheet-qualitycheckbox:checked ~ div.sheet-qualityticked,
+.sheet-spiritenotesunticked,
+.sheet-spiritenotescheckbox:checked ~ div.sheet-spiritenotesticked,
 .sheet-wareunticked,
 .sheet-warecheckbox:checked ~ div.sheet-wareticked,
 .sheet-equipmentunticked,
@@ -267,15 +269,14 @@ input.sheet-technomancycheckbox:checked ~ label.sheet-labeltechnomancer{
 .sheet-spiriteboundcheckbox:checked ~ div.sheet-spiriteboundticked,
 .sheet-spellspecializedunticked,
 .sheet-spellspecialized:checked ~ div.sheet-spellspecializedticked,
-.sheet-knowledgespecunticked,
-.sheet-skillspecunticked,
-.sheet-mskillspecunticked,
-.sheet-knowledgespecunticked,
+.sheet-skillspecticker:checked ~ div.sheet-skillspecunticked,
+.sheet-mskillspecticker:checked ~ div.sheet-mskillspecunticked,
+.sheet-knowledgespecticker:checked ~ div.sheet-knowledgespecunticked,
 .sheet-edgeunticked,
 .sheet-edgecheckbox:checked ~ div.sheet-edgeticked,
-.sheet-skillshowspec:checked ~ button.sheet-rollbuttonspec,
-.sheet-mskillshowspec:checked ~ button.sheet-rollbuttonspec,
-.sheet-knowledgeshowspec:checked ~ button.sheet-rollbuttonspec,
+.sheet-skillshowspec:checked ~ button.sheet-rollbuttonnospec,
+.sheet-mskillshowspec:checked ~ button.sheet-rollbuttonnospec,
+.sheet-knowledgeshowspec:checked ~ button.sheet-rollbuttonnospec,
 .sheet-content3 .sheet-technomancycheckbox:checked ~ div.sheet-spells button.sheet-spellrolltechno,
 .sheet-content3 .sheet-technomancycheckbox:checked ~ div.sheet-spells label.sheet-technolabel,
 .sheet-spellrollmage,
@@ -286,7 +287,8 @@ input.sheet-technomancycheckbox:checked ~ label.sheet-labeltechnomancer{
 }
 
 
-
+.sheet-edgehidebox,
+.sheet-edgehidebox:checked ~ div.sheet-edgecheckboxwrapper,
 .sheet-weaponmeleerollwrapper,
 .sheet-hiddenmelee:checked ~ div.sheet-weaponrcwrapper input,
 .sheet-hiddenmelee:checked ~ div.sheet-weaponmodewrapper select,
@@ -324,6 +326,8 @@ input.sheet-technomancycheckbox:checked ~ label.sheet-labeltechnomancer{
 .sheet-contactscheckbox:checked ~ div.sheet-contactsunticked,
 .sheet-qualityticked,
 .sheet-qualitycheckbox:checked ~ div.sheet-qualityunticked,
+.sheet-spiritenotesticked,
+.sheet-spiritenotescheckbox:checked ~ div.sheet-spiritenotesunticked,
 .sheet-wareticked,
 .sheet-warecheckbox:checked ~ div.sheet-wareunticked,
 .sheet-equipmentticked,
@@ -334,21 +338,21 @@ input.sheet-technomancycheckbox:checked ~ label.sheet-labeltechnomancer{
 .sheet-spiriteboundcheckbox:checked ~ div.sheet-spiriteboundunticked,
 .sheet-spellspecializedticked,
 .sheet-spellspecialized:checked ~ div.sheet-spellspecializedunticked,
-.sheet-knowledgespecticker:checked ~ div.sheet-knowledgespecunticked,
-.sheet-skillspecticker:checked ~ div.sheet-skillspecunticked,
-.sheet-mskillspecticker:checked ~ div.sheet-mskillspecunticked,
+.sheet-knowledgespecunticked,
+.sheet-skillspecunticked,
+.sheet-mskillspecunticked,
 .sheet-edgeticked,
 .sheet-edgecheckbox:checked ~ div.sheet-edgeunticked,.sheet-technomancycheckbox,
 .sheet-labeltechnomancer,
 .sheet-technomancer,
 .sheet-technomancerinitiation,
-.sheet-rollbuttonspec,
+.sheet-rollbuttonnospec,
 .sheet-skillshowspec,
-.sheet-skillshowspec:checked ~ button.sheet-rollbuttonnospec,
+.sheet-skillshowspec:checked ~ button.sheet-rollbuttonspec,
 .sheet-mskillshowspec,
-.sheet-mskillshowspec:checked ~ button.sheet-rollbuttonnospec,
+.sheet-mskillshowspec:checked ~ button.sheet-rollbuttonspec,
 .sheet-knowledgeshowspec,
-.sheet-knowledgeshowspec:checked ~ button.sheet-rollbuttonnospec,
+.sheet-knowledgeshowspec:checked ~ button.sheet-rollbuttonspec,
 .sheet-technomancycheckbox:checked ~ div.sheet-labelmage,
 .sheet-technomancycheckbox:checked ~ label.sheet-labelmage,
 .sheet-technomancycheckbox:checked ~ div.sheet-magician,
@@ -621,7 +625,7 @@ input.sheet-technomancycheckbox:checked ~ label.sheet-labeltechnomancer{
 .sheet-infoblock .sheet-weaponticked,
 .sheet-infoblock .sheet-weaponnoteswrapper,
 .sheet-infoblock .sheet-weapon input[type="checkbox"],
-.sheet-infoblock .sheet-ammonumberwrapper,
+.sheet-infoblock .sheet-ammomaxwrapper,
 .sheet-infoblock .sheet-ammodvwrapper,
 .sheet-infoblock .sheet-ammodmgtypewrapper,
 .sheet-infoblock .sheet-ammoapwrapper,
@@ -714,6 +718,7 @@ input.sheet-technomancycheckbox:checked ~ div.sheet-technomancer{
 .sheet-spells input[type=text],
 .sheet-spells select,
 .sheet-spiriterow input[type=text],
+.sheet-spiriterow textarea,
 .sheet-spiriterow select,
 .sheet-cyberdeck input[type=text],
 .sheet-cyberdeck input[type=number],
@@ -730,6 +735,7 @@ input.sheet-technomancycheckbox:checked ~ div.sheet-technomancer{
 .sheet-weapon select,
 .sheet-weapon textarea,
 .sheet-armor input[type=text],
+.sheet-armor input[type=number],
 .sheet-armor textarea,
 .sheet-charinfo input[type=text],
 .sheet-charinfo textarea{
@@ -785,7 +791,7 @@ input[disabled="true"]{
 .sheet-spells div:not(.sheet-checkboxticker):not(.itemcontrol),
 .sheet-qualityrow div:not(.itemcontrol):not(.sheet-checkboxticker):not(.sheet-qualitynoteswrapper),
 .sheet-initiationrow div:not(.itemcontrol),
-.sheet-spiriterow div:not(.itemcontrol):not(.sheet-technobound):not(.sheet-magebound):not(.sheet-checkboxticker),
+.sheet-spiriterow div:not(.itemcontrol):not(.sheet-spiritenoteswrapper):not(.sheet-technobound):not(.sheet-magebound):not(.sheet-checkboxticker),
 .sheet-warerow div:not(.sheet-checkboxticker):not(.sheet-warenoteswrapper):not(.itemcontrol),
 .sheet-contactsrow div:not(.sheet-checkboxticker):not(.sheet-contactsnoteswrapper):not(.itemcontrol),
 .sheet-programrow div:not(.sheet-checkboxticker):not(.itemcontrol),
@@ -849,16 +855,17 @@ input[disabled="true"]{
 }
 
 
-
+.sheet-qualitynamewrapper{
+    width:48%;
+}
 
 
 .sheet-equipmentnamewrapper,
-.sheet-specroll,
-.sheet-qualitydescriptionwrapper,
-.sheet-waredescriptionwrapper{
+.sheet-specroll{
     width:40%;
 }
 
+.sheet-warenamewrapper,
 .sheet-equipmentdescriptionwrapper,
 .sheet-charbackgroundwrapper,
 .sheet-chardescriptionwrapper,
@@ -876,20 +883,17 @@ input[disabled="true"]{
 .sheet-charnamewrapper,
 .sheet-contactnamewrapper,
 .sheet-contacttypewrapper,
-.sheet-warenamewrapper,
-.sheet-qualitynamewrapper,
 .sheet-metamagicnamewrapper,
-.sheet-programnamewrapper,
-.sheet-ammodescriptionwrapper{
+.sheet-programnamewrapper{
     width:25%;
 }
 
 
 .sheet-spiritenamewrapper,
 .sheet-charmetawrapper,
-.sheet-spiritetypewrapper,
 .sheet-spelldescriptionwrapper,
-.sheet-vehiclenamewrapper{
+.sheet-vehiclenamewrapper,
+.sheet-ammodescriptionwrapper{
     width:20%;
 }
 
@@ -908,6 +912,7 @@ input[disabled="true"]{
     width:16%;
 }
 
+.sheet-spiritetypewrapper,
 .sheet-vehicleskilldodge,
 .sheet-vehicleskillmaneuver,
 .sheet-vehicleskillperception,
@@ -927,7 +932,10 @@ input[disabled="true"]{
 .sheet-weaponnamewrapper,
 .sheet-qualitykarmawrapper,
 .sheet-wareessencewrapper,
-.sheet-weaponcategorywrapper{
+.sheet-weaponcategorywrapper,
+.sheet-qualitydescriptionwrapper,
+.sheet-waredescriptionwrapper,
+.sheet-waregradewrapper{
     width:15%;
 }
 
@@ -961,6 +969,7 @@ input[disabled="true"]{
 }
 
 
+.sheet-spiriterollwrapper,
 .sheet-ammoaccwrapper{
     width:8%;
 }
@@ -973,7 +982,7 @@ input[disabled="true"]{
     width:7%;
 }
 
-.sheet-spiriterollwrapper,
+.sheet-spellrollwrapper,
 .sheet-spiriteserviceswrapper,
 .sheet-spiriteforcewrapper,
 .sheet-spriterollwrapper,
@@ -985,7 +994,6 @@ input[disabled="true"]{
     width:6.5%;
 }
 
-
 .sheet-vehicleboxwrapper,
 .sheet-vehicleskillmodinput,
 .sheet-weaponmeleewrapper,
@@ -1027,6 +1035,10 @@ input[disabled="true"]{
 }
 
 
+.sheet-spellspecializationwrapper{
+    width:4%;
+}
+
 
 .sheet-programloadedwrapper{
     width:2.5em;
@@ -1064,15 +1076,17 @@ input[disabled="true"]{
 }
 
 
-.sheet-skillspecwrapper input[type="text"],
-.sheet-skillspecwrapper input[type="checkbox"]:checked,
-.sheet-mskillspecwrapper input[type="text"],
-.sheet-mskillspecwrapper input[type="checkbox"]:checked{
+.sheet-skillspecwrapper input[type="checkbox"]:checked ~ input[type="text"],
+.sheet-skillspecwrapper input[type="checkbox"],
+.sheet-mskillspecwrapper input[type="checkbox"]:checked ~ input[type="text"],
+.sheet-mskillspecwrapper input[type="checkbox"]{
     display:none;
 }
 
-.sheet-skillspecwrapper input[type="checkbox"]:checked ~ input[type="text"],
-.sheet-mskillspecwrapper input[type="checkbox"]:checked ~ input[type="text"]{
+.sheet-skillspecwrapper input[type="text"],
+.sheet-skillspecwrapper input[type="checkbox"]:checked,
+.sheet-mskillspecwrapper input[type="text"],
+.sheet-mskillspecwrapper input[type="checkbox"]:checked,{
     display:inline-block;
 }
 
@@ -1161,6 +1175,7 @@ input[disabled="true"]{
     width:100%;
 }
 
+.sheet-spiritespacer,
 .sheet-vehiclespacer{
     margin-right:calc(5% - 2em);
 }
@@ -1283,6 +1298,7 @@ input[disabled="true"]{
 .sheet-nuyennoteswrapper,
 .sheet-armornoteswrapper,
 .sheet-qualitynoteswrapper,
+.sheet-spiritenoteswrapper,
 .sheet-equipmentnoteswrapper{
     width:95%;
     padding-top:0.3em;
@@ -1309,6 +1325,7 @@ input[disabled="true"]{
 .sheet-notesblock textarea,
 .sheet-vehiclenoteswrapper textarea,
 .sheet-qualitynoteswrapper textarea,
+.sheet-spiritenoteswrapper textarea,
 .sheet-warenoteswrapper textarea,
 .sheet-contactsnoteswrapper textarea,
 .sheet-equipmentnoteswrapper textarea,
@@ -1329,6 +1346,7 @@ input[disabled="true"]{
 .sheet-nuyennoteswrapper,
 .sheet-warenoteswrapper,
 .sheet-qualitynoteswrapper,
+.sheet-spiritenoteswrapper,
 .sheet-contactsnoteswrapper,
 .sheet-armornoteswrapper,
 .sheet-weaponnoteswrapper{
@@ -1343,6 +1361,7 @@ input.sheet-vehicleweaponcheckbox:checked ~ div.sheet-vehicleweaponnoteswrapper,
 input.sheet-armornotescheckbox:checked ~ div.sheet-armornoteswrapper,
 input.sheet-warecheckbox:checked ~ div.sheet-warenoteswrapper,
 input.sheet-qualitycheckbox:checked ~ div.sheet-qualitynoteswrapper,
+input.sheet-spiritenotescheckbox:checked ~ div.sheet-spiritenoteswrapper,
 input.sheet-contactscheckbox:checked ~ div.sheet-contactsnoteswrapper,
 input.sheet-equipmentcheckbox:checked ~ div.sheet-equipmentnoteswrapper,
 input.sheet-nuyencheckbox:checked ~ div.sheet-nuyennoteswrapper,
diff --git a/Shadowrun5th/Shadowrun5th.html b/Shadowrun5th/Shadowrun5th.html
index c0a90be535..eeb71e0aec 100644
--- a/Shadowrun5th/Shadowrun5th.html
+++ b/Shadowrun5th/Shadowrun5th.html
@@ -102,37 +102,44 @@
                         <div class="checkboxticker edgeunticked"></div>
                         <div class="checkboxticker edgeticked">X</div>
                     </div>
+                    <input type="checkbox" class="edgehidebox" name="attr_edg_total" value="1">
                     <div class="edgecheckboxwrapper">
                         <input type="checkbox" class="hiddencheckbox edgecheckbox" name="attr_edg_2" title="Edge Used">
                         <div class="checkboxticker edgeunticked"></div>
                         <div class="checkboxticker edgeticked">X</div>
                     </div>
+                    <input type="checkbox" class="edgehidebox" name="attr_edg_total" value="2">
                     <div class="edgecheckboxwrapper">
                         <input type="checkbox" class="hiddencheckbox edgecheckbox" name="attr_edg_3" title="Edge Used">
                         <div class="checkboxticker edgeunticked"></div>
                         <div class="checkboxticker edgeticked">X</div>
                     </div>
+                    <input type="checkbox" class="edgehidebox" name="attr_edg_total" value="3">
                     <div class="edgecheckboxwrapper">
                         <input type="checkbox" class="hiddencheckbox edgecheckbox" name="attr_edg_4" title="Edge Used">
                         <div class="checkboxticker edgeunticked"></div>
                         <div class="checkboxticker edgeticked">X</div>
                     </div>
                         <br>
+                    <input type="checkbox" class="edgehidebox" name="attr_edg_total" value="4">
                     <div class="edgecheckboxwrapper">
                         <input type="checkbox" class="hiddencheckbox edgecheckbox" name="attr_edg_5" title="Edge Used">
                         <div class="checkboxticker edgeunticked"></div>
                         <div class="checkboxticker edgeticked">X</div>
                     </div>
+                    <input type="checkbox" class="edgehidebox" name="attr_edg_total" value="5">
                     <div class="edgecheckboxwrapper">
                         <input type="checkbox" class="hiddencheckbox edgecheckbox" name="attr_edg_6" title="Edge Used">
                         <div class="checkboxticker edgeunticked"></div>
                         <div class="checkboxticker edgeticked">X</div>
                     </div>
+                    <input type="checkbox" class="edgehidebox" name="attr_edg_total" value="6">
                     <div class="edgecheckboxwrapper">
                         <input type="checkbox" class="hiddencheckbox edgecheckbox" name="attr_edg_7" title="Edge Used">
                         <div class="checkboxticker edgeunticked"></div>
                         <div class="checkboxticker edgeticked">X</div>
                     </div>
+                    <input type="checkbox" class="edgehidebox" name="attr_edg_total" value="7">
                     <div class="edgecheckboxwrapper">
                         <input type="checkbox" class="hiddencheckbox edgecheckbox" name="attr_edg_8" title="Edge Used">
                         <div class="checkboxticker edgeunticked"></div>
@@ -541,10 +548,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                                 <input type="text" name="attr_ammodescription1" title="Additional Description"> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple1" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory1}-Skill}}{{val2_num=[[@{weaponbonus1}+@{weaponskill1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+@{ammoacc1}]]}}{{result=[[(@{agi_total}+@{weaponskill1}+@{weaponbonus1}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy1}+@{ammoacc1}]]]]}}{{after1=AP([[@{weaponap1}+@{ammoap1}]]) ~ DV}}{{after1_num=[[@{weapondv1}+@{ammodv1}]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[@{weaponmode1}-floor(@{weaponmode1}/10)*10]]}}{{description=@{ammodescription1}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple1" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory1}-Skill}}{{val2_num=[[@{weaponbonus1}+@{weaponskill1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+@{ammoacc1}]]}}{{result=[[(@{agi_total}+@{weaponskill1}+@{weaponbonus1}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy1}+@{ammoacc1}]]]]}}{{after1=AP([[@{weaponap1}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[@{weaponmode1}-floor(@{weaponmode1}/10)*10]]}}{{description=@{ammodescription1}}}" /> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex1" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory1}-Skill}}{{val2_num=[[@{weaponbonus1}+@{weaponskill1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+@{ammoacc1}]]}}{{result=[[(@{agi_total}+@{weaponskill1}+@{weaponbonus1}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy1}+@{ammoacc1}]]]]}}{{after1=AP([[@{weaponap1}+@{ammoap1}]]) ~ DV}}{{after1_num=[[@{weapondv1}+@{ammodv1}]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[floor(@{weaponmode1}/10)]]}}{{description=@{ammodescription1}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex1" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory1}-Skill}}{{val2_num=[[@{weaponbonus1}+@{weaponskill1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+@{ammoacc1}]]}}{{result=[[(@{agi_total}+@{weaponskill1}+@{weaponbonus1}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy1}+@{ammoacc1}]]]]}}{{after1=AP([[@{weaponap1}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[floor(@{weaponmode1}/10)]]}}{{description=@{ammodescription1}}}" /> 
                             </div>
                         </div>
                     </fieldset>
@@ -676,10 +683,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                                 <input type="text" name="attr_ammodescription2" title="Additional Description"> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple2" title="Fire the Weapon as a Simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory2}-Skill}}{{val2_num=[[@{weaponbonus2}+@{weaponskill2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+@{ammoacc2}]]}}{{result=[[(@{agi_total}+@{weaponskill2}+@{weaponbonus2}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy2}+@{ammoacc2}]]]]}}{{after1=AP([[@{weaponap2}+@{ammoap2}]]) ~ DV}}{{after1_num=[[@{weapondv2}+@{ammodv2}]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=@{ammoname2} Rounds}}{{after2_num=[[@{weaponmode2}-floor(@{weaponmode2}/10)*10]]}}{{description=@{ammodescription2}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple2" title="Fire the Weapon as a Simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory2}-Skill}}{{val2_num=[[@{weaponbonus2}+@{weaponskill2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+@{ammoacc2}]]}}{{result=[[(@{agi_total}+@{weaponskill2}+@{weaponbonus2}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy2}+@{ammoacc2}]]]]}}{{after1=AP([[@{weaponap2}+@{ammoap2}]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv2})]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=@{ammoname2} Rounds}}{{after2_num=[[@{weaponmode2}-floor(@{weaponmode2}/10)*10]]}}{{description=@{ammodescription2}}}" /> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex2" title="Fire the Weapon as a Complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory2}-Skill}}{{val2_num=[[@{weaponbonus2}+@{weaponskill2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+@{ammoacc2}]]}}{{result=[[(@{agi_total}+@{weaponskill2}+@{weaponbonus2}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy2}+@{ammoacc2}]]]]}}{{after1=AP([[@{weaponap2}+@{ammoap2}]]) ~ DV}}{{after1_num=[[@{weapondv2}+@{ammodv2}]]}}{{after1dmg=@{ammodmgtype2}}}{{after2_num=[[floor(@{weaponmode2}/10)]]}}{{description=@{ammodescription2}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex2" title="Fire the Weapon as a Complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory2}-Skill}}{{val2_num=[[@{weaponbonus2}+@{weaponskill2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+@{ammoacc2}]]}}{{result=[[(@{agi_total}+@{weaponskill2}+@{weaponbonus2}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy2}+@{ammoacc2}]]]]}}{{after1=AP([[@{weaponap2}+@{ammoap2}]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv2})]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=@{ammoname2} Rounds}}{{after2_num=[[floor(@{weaponmode2}/10)]]}}{{description=@{ammodescription2}}}" /> 
                             </div>
                         </div>
                     </fieldset>
@@ -808,10 +815,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                                 <input type="text" name="attr_ammodescription3" title="Additional Description"> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple3" title="Fire the Weapon as a Simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory3}-Skill}}{{val2_num=[[@{weaponbonus3}+@{weaponskill3}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+@{ammoacc3}]]}}{{result=[[(@{agi_total}+@{weaponskill3}+@{weaponbonus3}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy3}+@{ammoacc3}]]]]}}{{after1=AP([[@{weaponap3}+@{ammoap3}}]]) ~ DV}}{{after1_num=[[@{weapondv3}+@{ammodv3}]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[@{weaponmode3}-floor(@{weaponmode3}/10)*10]]}}{{description=@{ammodescription3}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple3" title="Fire the Weapon as a Simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory3}-Skill}}{{val2_num=[[@{weaponbonus3}+@{weaponskill3}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+@{ammoacc3}]]}}{{result=[[(@{agi_total}+@{weaponskill3}+@{weaponbonus3}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy3}+@{ammoacc3}]]]]}}{{after1=AP([[@{weaponap3}+(@{ammoap3})}]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{ammodv3})]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[@{weaponmode3}-floor(@{weaponmode3}/10)*10]]}}{{description=@{ammodescription3}}}" /> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex3" title="Fire the Weapon as a Complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory3}-Skill}}{{val2_num=[[@{weaponbonus3}+@{weaponskill3}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+@{ammoacc3}]]}}{{result=[[(@{agi_total}+@{weaponskill3}+@{weaponbonus3}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy3}+@{ammoacc3}]]]]}}{{after1=AP([[@{weaponap3}+@{ammoap3}}]]) ~ DV}}{{after1_num=[[@{weapondv3}+@{ammodv3}]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[floor(@{weaponmode3}/10)]]}}{{description=@{ammodescription3}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex3" title="Fire the Weapon as a Complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory3}-Skill}}{{val2_num=[[@{weaponbonus3}+@{weaponskill3}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+@{ammoacc3}]]}}{{result=[[(@{agi_total}+@{weaponskill3}+@{weaponbonus3}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy3}+@{ammoacc3}]]]]}}{{after1=AP([[@{weaponap3}+(@{ammoap3})}]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{ammodv3})]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[floor(@{weaponmode3}/10)]]}}{{description=@{ammodescription3}}}" /> 
                             </div>
                         </div>
                     </fieldset>
@@ -943,10 +950,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                                 <input type="text" name="attr_ammodescription4" title="Additional Description"> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple4" title="Fire the Weapon as a Simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory4}-Skill}}{{val2_num=[[@{weaponbonus4}+@{weaponskill4}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+@{ammoacc4}]]}}{{result=[[(@{agi_total}+@{weaponskill4}+@{weaponbonus4}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy4}+@{ammoacc4}]]]]}}{{after1=AP([[@{weaponap4}+@{ammoap4}}]]) ~ DV}}{{after1_num=[[@{weapondv4}+@{ammodv4}]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4}}}{{after2_num=[[@{weaponmode4}-floor(@{weaponmode4}/10)*10]]}}{{description=@{ammodescription4}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple4" title="Fire the Weapon as a Simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory4}-Skill}}{{val2_num=[[@{weaponbonus4}+@{weaponskill4}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+@{ammoacc4}]]}}{{result=[[(@{agi_total}+@{weaponskill4}+@{weaponbonus4}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy4}+@{ammoacc4}]]]]}}{{after1=AP([[@{weaponap4}+(@{ammoap4})}]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{ammodv4})]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4}}}{{after2_num=[[@{weaponmode4}-floor(@{weaponmode4}/10)*10]]}}{{description=@{ammodescription4}}}" /> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammoroll4complex" title="Fire the Weapon as a Complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory4}-Skill}}{{val2_num=[[@{weaponbonus4}+@{weaponskill4}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+@{ammoacc4}]]}}{{result=[[(@{agi_total}+@{weaponskill4}+@{weaponbonus4}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy4}+@{ammoacc4}]]]]}}{{after1=AP([[@{weaponap4}+@{ammoap4}}]]) ~ DV}}{{after1_num=[[@{weapondv4}+@{ammodv4}]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4}}}{{after2_num=[[floor(@{weaponmode4}/10)]]}}{{description=@{ammodescription4}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammoroll4complex" title="Fire the Weapon as a Complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory4}-Skill}}{{val2_num=[[@{weaponbonus4}+@{weaponskill4}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+@{ammoacc4}]]}}{{result=[[(@{agi_total}+@{weaponskill4}+@{weaponbonus4}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy4}+@{ammoacc4}]]]]}}{{after1=AP([[@{weaponap4}+(@{ammoap4})}]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{ammodv4})]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4}}}{{after2_num=[[floor(@{weaponmode4}/10)]]}}{{description=@{ammodescription4}}}" /> 
                             </div>
                         </div>
                     </fieldset>
@@ -1078,10 +1085,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                                 <input type="text" name="attr_ammodescription5" title="Additional Description"> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple5" title="Fire the Weapon as a Simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory5}-Skill}}{{val2_num=[[@{weaponbonus5}+@{weaponskill5}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+@{ammoacc5}]]}}{{result=[[(@{agi_total}+@{weaponskill5}+@{weaponbonus5}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy5}+@{ammoacc5}]]]]}}{{after1=AP([[@{weaponap5}+@{ammoap5}}]]) ~ DV}}{{after1_num=[[@{weapondv5}+@{ammodv5}]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5}}}{{after2_num=[[@{weaponmode5}-floor(@{weaponmode5}/10)*10]]}}{{description=@{ammodescription5}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple5" title="Fire the Weapon as a Simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory5}-Skill}}{{val2_num=[[@{weaponbonus5}+@{weaponskill5}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+@{ammoacc5}]]}}{{result=[[(@{agi_total}+@{weaponskill5}+@{weaponbonus5}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy5}+@{ammoacc5}]]]]}}{{after1=AP([[@{weaponap5}+(@{ammoap5}})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{ammodv5})]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5}}}{{after2_num=[[@{weaponmode5}-floor(@{weaponmode5}/10)*10]]}}{{description=@{ammodescription5}}}" /> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex5" title="Fire the Weapon as a Simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory5}-Skill}}{{val2_num=[[@{weaponbonus5}+@{weaponskill5}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+@{ammoacc5}]]}}{{result=[[(@{agi_total}+@{weaponskill5}+@{weaponbonus5}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy5}+@{ammoacc5}]]]]}}{{after1=AP([[@{weaponap5}+@{ammoap5}}]]) ~ DV}}{{after1_num=[[@{weapondv5}+@{ammodv5}]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5}}}{{after2_num=[[floor(@{weaponmode5}/10)]]}}{{description=@{ammodescription5}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex5" title="Fire the Weapon as a Simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory5}-Skill}}{{val2_num=[[@{weaponbonus5}+@{weaponskill5}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+@{ammoacc5}]]}}{{result=[[(@{agi_total}+@{weaponskill5}+@{weaponbonus5}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy5}+@{ammoacc5}]]]]}}{{after1=AP([[@{weaponap5}+(@{ammoap5})}]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{ammodv5})]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5}}}{{after2_num=[[floor(@{weaponmode5}/10)]]}}{{description=@{ammodescription5}}}" /> 
                             </div>
                         </div>
                     </fieldset>
@@ -1213,10 +1220,10 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                                 <input type="text" name="attr_ammodescription6" title="Additional Description"> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple6" title="Fire the Weapon as a Simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory6}-Skill}}{{val2_num=[[@{weaponbonus6}+@{weaponskill6}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+@{ammoacc6}]]}}{{result=[[(@{agi_total}+@{weaponskill6}+@{weaponbonus6}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy6}+@{ammoacc6}]]]]}}{{after1=AP([[@{weaponap6}+@{ammoap6}}]]) ~ DV}}{{after1_num=[[@{weapondv6}+@{ammodv6}]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6}}}{{after2_num=[[@{weaponmode6}-floor(@{weaponmode6}/10)*10]]}}{{description=@{ammodescription6}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollsimple6" title="Fire the Weapon as a Simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory6}-Skill}}{{val2_num=[[@{weaponbonus6}+@{weaponskill6}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+@{ammoacc6}]]}}{{result=[[(@{agi_total}+@{weaponskill6}+@{weaponbonus6}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy6}+@{ammoacc6}]]]]}}{{after1=AP([[@{weaponap6}+(@{ammoap6})}]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{ammodv6})]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6}}}{{after2_num=[[@{weaponmode6}-floor(@{weaponmode6}/10)*10]]}}{description=@{ammodescription6}}}{{description=@{ammodescription6}}}" /> 
                             </div>
                             <div class="ammorollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex6" title="Fire the Weapon as a Complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory6}-Skill}}{{val2_num=[[@{weaponbonus6}+@{weaponskill6}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+@{ammoacc6}]]}}{{result=[[(@{agi_total}+@{weaponskill6}+@{weaponbonus6}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy6}+@{ammoacc6}]]]]}}{{after1=AP([[@{weaponap6}+@{ammoap6}}]]) ~ DV}}{{after1_num=[[@{weapondv6}+@{ammodv6}]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6}}}{{after2_num=[[floor(@{weaponmode6}/10)]]}}{{description=@{ammodescription6}}}" /> 
+                                <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex6" title="Fire the Weapon as a Complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory6}-Skill}}{{val2_num=[[@{weaponbonus6}+@{weaponskill6}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+@{ammoacc6}]]}}{{result=[[(@{agi_total}+@{weaponskill6}+@{weaponbonus6}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy6}+@{ammoacc6}]]]]}}{{after1=AP([[@{weaponap6}+(@{ammoap6})}]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{ammodv6})]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6}}}{{after2_num=[[floor(@{weaponmode6}/10)]]}}{{description=@{ammodescription6}}}" /> 
                             </div>
                         </div>
                     </fieldset>
@@ -1299,15 +1306,15 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                         <input type="text" name="attr_skillnotes" title="Description...">
                     </div>
                     <div class="skillspecwrapper">
-                        <input type="checkbox" class="skillspecticker hiddencheckbox" name="attr_skillshowspec" value="2" title="Check if Skill has Specialization">
+                        <input type="checkbox" class="skillspecticker hiddencheckbox" name="attr_skillspec" value="none" title="Check if Skill has Specialization" checked>
                         <div class="checkboxticker skillspecunticked"></div>
-                        <input type="text" name="attr_skillspec" title="Name of the Specialization">
+                        <input type="text" name="attr_skillspec" title="Name of the Specialization; input 'none' to disable.">
                     </div>
                     <div class="skilldicepoolwrapper">
                         <input type="number" name="attr_skilldicepool" value="@{skillattr}_total}+@{skillrating}+@{skillbonus}" title="Base Dicepool" disabled="true">
                     </div>
                     <div class="skillbuttonwrapper">
-                        <input type="checkbox" class="skillshowspec" name="attr_skillshowspec" value="2">
+                        <input type="checkbox" class="skillshowspec" name="attr_skillspec" value="none">
                         <button type="roll" class="rollbuttonspec" name="roll_skillroll" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname}}}{{val1=@{skillattr}_name}}}{{val1_num=[[@{skillattr}_total}]]}}{{val2=@{skillname}}}{{val2_num=[[@{skillrating}+@{skillbonus}]]}}{{val3=@{skillspec}}}{{val3_num=[[2*(?{Specialization @{skillspec} applies|Yes,1|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit}_name}}}{{limit_num=[[@{skilllimit}_total}]]}}{{limit_mod=[[@{skilllimitbonus}]]}}{{result=[[(@{skilldicepool}+(2*?{Specialization @{skillspec} applies})-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[[[@{skilllimit}_total}]]+@{skilllimitbonus}]]]]}}{{description=@{skillnotes}}" />
                         <button type="roll" class="rollbuttonnospec" name="roll_skillroll" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{skillname}}}{{val1=@{skillattr}_name}}}{{val1_num=[[@{skillattr}_total}]]}}{{val2=@{skillname}}}{{val2_num=[[@{skillrating}+@{skillbonus}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{skilllimit}_name}}}{{limit_num=[[@{skilllimit}_total}]]}}{{limit_mod=[[@{skilllimitbonus}]]}}{{result=[[(@{skilldicepool}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[[[@{skilllimit}_total}]]+@{skilllimitbonus}]]]]}}{{description=@{skillnotes}}" />
                     </div>
@@ -1372,15 +1379,15 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                         <input type="text" name="attr_knowledgenotes" title="Description...">
                     </div>
                     <div class="skillspecwrapper">
-                        <input type="checkbox" class="knowledgespecticker hiddencheckbox" name="attr_knowledgeshowspec" value="2" title="Check if Skill has Specialization">
+                        <input type="checkbox" class="knowledgespecticker hiddencheckbox" name="attr_knowledgespec" value="none" title="Check if Skill has Specialization" checked>
                         <div class="checkboxticker knowledgespecunticked"></div>
-                        <input type="text" name="attr_knowledgespec" title="Name of the Specialization">
+                        <input type="text" name="attr_knowledgespec" title="Name of the Specialization; input 'none' to disable.">
                     </div>
                     <div class="skilldicepoolwrapper">
                         <input type="number" name="attr_knowledgedicepool" value="@{knowledgeattr}_total}+@{knowledgerating}+@{knowledgebonus}" title="Base Dicepool" disabled="true">
                     </div>
                     <div class="skillbuttonwrapper">
-                        <input type="checkbox" class="knowledgeshowspec" name="attr_knowledgeshowspec" value="2">
+                        <input type="checkbox" class="knowledgeshowspec" name="attr_knowledgespec" value="none">
                         <button type="roll" class="rollbuttonspec" name="roll_knowledgeroll" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{knowledgename}}}{{val1=@{knowledgeattr}_name}}}{{val1_num=[[@{knowledgeattr}_total}]]}}{{val2=@{knowledgename}}}{{val2_num=[[@{knowledgerating}+@{knowledgebonus}]]}}{{val3=@{knowledgespec}}}{{val3_num=[[2*(?{Specialization @{knowledgespec} applies|Yes,1|No,0})]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{mental_name}}}{{limit_num=[[@{mental_total}]]}}{{limit_mod=[[@{knowledgelimitbonus}]]}}{{result=[[(@{knowledgedicepool}+(2*?{Specialization @{knowledgespec} applies|yes,1|no,0})-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[[[@{mental_total}]]+@{knowledgelimitbonus}]]]]}}{{description=@{knowledgenotes}}" />
                         <button type="roll" class="rollbuttonnospec" name="roll_knowledgeroll" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{knowledgename}}}{{val1=@{knowledgeattr}_name}}}{{val1_num=[[@{knowledgeattr}_total}]]}}{{val2=@{knowledgename}}}{{val2_num=[[@{knowledgerating}+@{knowledgebonus}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{mental_name}}}{{limit_num=[[@{mental_total}]]}}{{limit_mod=[[@{knowledgelimitbonus}]]}}{{result=[[(@{knowledgedicepool}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[[[@{mental_total}]]+@{knowledgelimitbonus}]]]]}}{{description=@{knowledgenotes}}" />
                     </div>
@@ -1490,6 +1497,9 @@ Can lift overhead (Strength + Nethits) x 5kg}}" />
                 <div class="spellspecializationwrapper">
                     <label class="spelllabel">Spec</label>
                 </div>
+                <div class="spellrollwrapper">
+                    <label class="spelllabel">Roll</label>
+                </div>
             </div>
             <fieldset class="repeating_spells">
                 <div class="spellrow">
@@ -1551,10 +1561,10 @@ make sure to enter what the spell is resisted with">
                 </div>
                 <div class="spiriterow">
                     <div class="spiritelabel">
-                        <button type="roll" class="spellrollmage" name="roll_summonroll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to summon}}{{val1=@{mag_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=Summoning}}{{val2_num=[[@{summoning_skill}+?{Specialized in this Spirit|yes,2|no,0}]]}}{{val3=Drain Attribute}}{{val3_num=[[@{drainattribute}+?{Drain Resist Bonus|0}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{val5=Force}}{{val5_num=[[?{Force|6}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Astral Limit}}{{limit_num=[[@{astral_total}]]}}{{limit_mod=[[?{Raise Limit by|0}]]}}{{result=[[(@{mag_total}+@{summoning_skill}+?{Specialized in this Spirit}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[[[@{astral_total}]]+?{Raise Limit by|0}]]]]}}{{after1=Spirit Defense}}{{after1_num=[[?{Force|6}d6cs>5>5sd]]}}{{after2=Drain Resist}}{{drain=Drain}}{{spiritdrain=true}}{{after2_num=[[(@{wil_total}+@{drainattribute}+?{Drain Resist Bonus|0})d6cs>5>5sd]]}}" />
+                        <button type="roll" class="spellrollmage" name="roll_summonroll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to summon}}{{val1=@{mag_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=Summoning}}{{val2_num=[[@{summoning_skill}+?{Specialized in this Spirit|yes,2|no,0}]]}}{{val3=Drain Attribute}}{{val3_num=[[@{drainattribute}+?{Drain Resist Bonus|0}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Force}}{{limit_num=[[?{Force|6}]]}}{{limit_mod=[[?{Raise Limit by|0}]]}}{{result=[[(@{mag_total}+@{summoning_skill}+?{Specialized in this Spirit}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[[[?{Force}]]+?{Raise Limit by|0}]]]]}}{{after1=Spirit Defense}}{{after1_num=[[?{Force|6}d6cs>5>5sd]]}}{{after2=Drain Resist}}{{drain=Drain}}{{spiritdrain=true}}{{after2_num=[[(@{wil_total}+@{drainattribute}+?{Drain Resist Bonus|0})d6cs>5>5sd]]}}" />
                     </div>
                     <div class="spiritelabel">
-                        <button type="roll" class="spellrollmage" name="roll_bindroll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to bind}}{{val1=@{mag_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=Binding}}{{val2_num=[[@{binding_skill}+?{Specialized in this Spirit|yes,2|no,0}]]}}{{val3=Drain Attribute}}{{val3_num=[[@{drainattribute}+?{Drain Resist Bonus|0}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{val5=Force}}{{val5_num=[[?{Force|6}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Astral Limit}}{{limit_num=[[@{astral_total}]]}}{{limit_mod=[[?{Raise Limit by|0}]]}}{{result=[[(@{mag_total}+@{binding_skill}+?{Specialized in this Spirit}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[[[@{astral_total}]]+?{Raise Limit by|0}]]]]}}{{after1=Spirit Defense}}{{after1_num=[[(?{Force|6}*2)d6cs>5>5sd]]}}{{after2=Drain Resist}}{{drain=Drain}}{{spiritdrain=true}}{{after2_num=[[(@{wil_total}+@{drainattribute}+?{Drain Resist Bonus|0})d6cs>5>5sd]]}}" />
+                        <button type="roll" class="spellrollmage" name="roll_bindroll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=to bind}}{{val1=@{mag_name}}}{{val1_num=[[@{mag_total}]]}}{{val2=Binding}}{{val2_num=[[@{binding_skill}+?{Specialized in this Spirit|yes,2|no,0}]]}}{{val3=Drain Attribute}}{{val3_num=[[@{drainattribute}+?{Drain Resist Bonus|0}]]}}{{val4=@{wil_name}}}{{val4_num=[[@{wil_total}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Force}}{{limit_num=[[?{Force|6}]]}}{{limit_mod=[[?{Raise Limit by|0}]]}}{{result=[[(@{mag_total}+@{binding_skill}+?{Specialized in this Spirit}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[[[?{Force}]]+?{Raise Limit by|0}]]]]}}{{after1=Spirit Defense}}{{after1_num=[[(?{Force|6}*2)d6cs>5>5sd]]}}{{after2=Drain Resist}}{{drain=Drain}}{{spiritdrain=true}}{{after2_num=[[(@{wil_total}+@{drainattribute}+?{Drain Resist Bonus|0})d6cs>5>5sd]]}}" />
                     </div>
                 </div>
             </div>
@@ -1636,12 +1646,18 @@ make sure to enter what the spell is resisted with">
                 <div class="spiriterollwrapper">
                     <label>Attribute</label> 
                 </div>
+                <div class="spiriterollwrapper">
+                    <label>Show Stats</label> 
+                </div>
                 <div class="spiriteboundwrapper magebound">
                     <label>Bound</label> 
                 </div>
                 <div class="spiriteboundwrapper technobound">
                     <label>Registered</label> 
                 </div>
+                <div class="spiritenoteslabelwrapper">
+                    <label>Notes</label> 
+                </div>
             </div>
             <fieldset class="repeating_spirites">
                 <div class="spiriterow">
@@ -1684,7 +1700,7 @@ make sure to enter what the spell is resisted with">
                         <button type="roll" class="spellrollmage" name="roll_spriteinitiativeroll" title="Roll for Initiative with this Sprite" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename}(@{spritetype}_name})}}{{roll_name=for Matrix Initiative}}{{val1=Level}}{{val1_num=[[@{spiriteforce}]]}}{{val2=Data Processing}}{{val2_num=[[{@{spiriteforce}@{spritetype}_datap},1}kh1]]}}{{val3=Dice}}{{val3_num=[[4]]}}{{initiative=[[@{spiriteforce}+[[{@{spiriteforce}@{spritetype}_datap},1}kh1]]+4d6 &{tracker}]]}}"></button>
                     </div>
                     <div class="spiriterollwrapper magebound">
-                        <button type="roll" class="spellrollmage" name="roll_spirittest" title="Roll a Skill Test or a Test with 2 Attributes" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename}(@{spirittype}_name})}}{{val1=Force}}{{val1_num=[[@{spiriteforce}]]}}{{val2=Dice-Pool Part1}}{{val2_num=[[{@{spiriteforce}?{Spirit Attribute|Body,@{spirittype}_bod}|Agility,@{spirittype}_agi}|Reaction,@{spirittype}_rea}|Strength,@{spirittype}_str}|Willpower,@{spirittype}_wil}|Logic,@{spirittype}_log}|Intuition,@{spirittype}_int}|Charisma,@{spirittype}_cha}|Magic,-0|Force,-0},1}kh1]]}}{{val3=Dice-Pool Part2}}{{val3_num=[[{@{Spiriteforce}?{Part 2|Skill,-0|Body,@{spirittype}_bod}|Agility,@{spirittype}_agi}|Reaction,@{spirittype}_rea}|Strength,@{spirittype}_str}|Willpower,@{spirittype}_wil}|Logic,@{spirittype}_log}|Intuition,@{spirittype}_int}|Charisma,@{spirittype}_cha}|Magic,-0|Force,-0},1}kh1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit=Limit}}{{limit_num=[[?{Limit|Force,@{spiriteforce}|Physical,ceil((@{spiriteforce}*4@{spirittype}_str}*2@{spirittype}_agi}@{spirittype}_bod})/3)|Mental,ceil((@{spiriteforce}*4@{spirittype}_log}*2@{spirittype}_int}@{spirittype}_wil})/3)|Social,ceil((@{spiriteforce}*4)/3)|Astral,ceil((@{spiriteforce}*4)/3)}]]}}{{result=[[([[{@{spiriteforce}?{Spirit Attribute},1}kh1]]+[[{@{spiriteforce}?{Part 2},1}kh1]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[?{Limit}]]]]}}" />
+                        <button type="roll" class="spellrollmage" name="roll_spirittest" title="Roll a Skill Test or a Test with 2 Attributes" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename}(@{spirittype}_name})}}{{val1=Force}}{{val1_num=[[@{spiriteforce}]]}}{{val2=Dice-Pool Part1}}{{val2_num=[[{@{spiriteforce}?{Spirit Attribute|Body,@{spirittype}_bod}|Agility,@{spirittype}_agi}|Reaction,@{spirittype}_rea}|Strength,@{spirittype}_str}|Willpower,@{spirittype}_wil}|Logic,@{spirittype}_log}|Intuition,@{spirittype}_int}|Charisma,@{spirittype}_cha}|Magic,-0|Force,-0},1}kh1]]}}{{val3=Dice-Pool Part2}}{{val3_num=[[{@{Spiriteforce}?{Part 2|Skill,-0|Body,@{spirittype}_bod}|Agility,@{spirittype}_agi}|Reaction,@{spirittype}_rea}|Strength,@{spirittype}_str}|Willpower,@{spirittype}_wil}|Logic,@{spirittype}_log}|Intuition,@{spirittype}_int}|Charisma,@{spirittype}_cha}|Magic,-0|Force x2,*2},1}kh1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit=Limit}}{{limit_num=[[?{Limit|Force,@{spiriteforce}|Physical,ceil((@{spiriteforce}*4@{spirittype}_str}*2@{spirittype}_agi}@{spirittype}_bod})/3)|Mental,ceil((@{spiriteforce}*4@{spirittype}_log}*2@{spirittype}_int}@{spirittype}_wil})/3)|Social,ceil((@{spiriteforce}*4)/3)|Astral,ceil((@{spiriteforce}*4)/3)}]]}}{{result=[[([[{@{spiriteforce}?{Spirit Attribute},1}kh1]]+[[{@{spiriteforce}?{Part 2},1}kh1]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[?{Limit}]]]]}}" />
                     </div>
                     <div class="spiriterollwrapper technobound">
                         <button type="roll" class="spellrollmage" name="roll_spritetest" title="Roll a Skill Test or a Test with 2 Attributes" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename}(@{spritetype}_name})}}{{val1=Level}}{{val1_num=[[@{spiriteforce}]]}}{{val2=Attribute}}{{val2_num=[[{@{spiriteforce}?{Sprite Attribute|Level,-0|Attack,@{spritetype}_attack}|Sleaze,@{spritetype}_sleaze}|Data Proc.,@{spritetype}_datap}|Firewall,@{spritetype}_firewall}},1}kh1]]}}{{limit=Limit}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit_num=[[@{spiriteforce}?{Limit|Level,-0|Attack,@{spritetype}_attack}|Sleaze,@{spritetype}_sleaze}|Data Proc.,@{spritetype}_datap}|Firewall,@{spritetype}_firewall},1}kh1]]}}{{result=[[([[{@{spiriteforce}?{Sprite Attribute},1}kh1]]+@{spiriteforce}+?{Situational Modifiers|0})d6cs>5>5sdkh[[{@{spiriteforce}?{Limit},1}kh1]]]]}}" />
@@ -1695,10 +1711,21 @@ make sure to enter what the spell is resisted with">
                     <div class="spiriterollwrapper technobound">
                         <button type="roll" class="spellrollmage" name="roll_spriteattribute" title="Roll a Test with a single Attributes" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename}(@{spritetype}_name})}}{{val1=Level}}{{val1_num=[[@{spiriteforce}]]}}{{val2=Attribute}}{{val2_num=[[{@{spiriteforce}?{Sprite Attribute|Level,-0|Attack,@{spritetype}_attack}|Sleaze,@{spritetype}_sleaze}|Data Proc.,@{spritetype}_datap}|Firewall,@{spritetype}_firewall}},1}kh1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{result=[[([[{@{spiriteforce}?{Sprite Attribute},1}kh1]]+?{Situational Modifiers|0})d6cs>5>5sd]]}}" />
                     </div>
-                    <div class="spiriteboundwrapper">
-                        <input type="checkbox" class="hiddencheckbox spiriteboundcheckbox" name="attr_spiritebound">
-                        <div class="checkboxticker spiriteboundunticked"></div>
-                        <div class="checkboxticker spiriteboundticked">X</div>
+                    <div class="spiriterollwrapper magebound">
+                        <button type="roll" class="spellrollmage" name="roll_spiritattributes" title="Output Attributes to Chat" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename}(@{spirittype}_name})}}{{roll_name=his stats}}{{val1=Body}}{{val1_num=[[{@{spiriteforce}@{spirittype}_bod},1}kh1]]}}{{val2=Agility}}{{val2_num=[[{@{spiriteforce}@{spirittype}_agi},1}kh1]]}}{{val3=Reaction}}{{val3_num=[[{@{spiriteforce}@{spirittype}_rea},1}kh1]]}}{{val4=Strength}}{{val4_num=[[{@{spiriteforce}@{spirittype}_str},1}kh1]]}}{{val5=Willpower}}{{val5_num=[[{@{spiriteforce}@{spirittype}_wil},1}kh1]]}}{{val6=Logic}}{{val6_num=[[{@{spiriteforce}@{spirittype}_log},1}kh1]]}}{{val7=Intuition}}{{val7_num=[[{@{spiriteforce}@{spirittype}_int},1}kh1]]}}{{val8=Charisma}}{{val8_num=[[{@{spiriteforce}@{spirittype}_cha},1}kh1]]}}{{description=@{spiritenotes}}}" />
+                    </div>
+                    <div class="spiriterollwrapper technobound">
+                        <button type="roll" class="spellrollmage" name="roll_spriteattributes" title="Output Attributes to Chat" value="@{gmroll}&{template:shadowrun}{{name=@{spiritename}(@{spritetype}_name})}}{{roll_name=his stats}}{{val1=Level}}{{val1_num=[[@{spiriteforce}]]}}{{val2=Attack}}{{val2_num=[[{@{spiriteforce}@{spritetype}_attack},1}kh1]]}}{{val3=Sleaze}}{{val3_num=[[{@{spiriteforce}@{spritetype}_sleaze},1}kh1]]}}{{val4=Data Proc.}}{{val4_num=[[{@{spiriteforce}@{spritetype}_datap},1}kh1]]}}{{val5=Firewall}}{{val5_num=[[{@{spiriteforce}@{spritetype}_firewall},1}kh1]]}}{{description=@{spiritenotes}}}" />
+                    </div>
+                    <input type="checkbox" class="hiddencheckbox spiriteboundcheckbox" name="attr_spiritebound">
+                    <div class="checkboxticker spiriteboundunticked"></div>
+                    <div class="checkboxticker spiriteboundticked">X</div>
+                    <div class="spiritespacer"></div>
+                    <input class="spiritenotescheckbox hiddencheckbox" type="checkbox" name="attr_showposspiritenotes" title="Need more Space?">
+                    <div class="checkboxticker spiritenotesunticked"></div>
+                    <div class="checkboxticker spiritenotesticked">X</div>
+                    <div class="spiritenoteswrapper">
+                        <textarea name="attr_spiritenotes" title="Have more Space!"></textarea>
                     </div>
                 </div>
             </fieldset>
@@ -1712,7 +1739,7 @@ make sure to enter what the spell is resisted with">
                     <label class="qualitylabel">Name</label>
                 </div>
                 <div class="qualitydescriptionwrapper">
-                    <label class="qualitylabel">Description</label>
+                    <label class="qualitylabel">Rating</label>
                 </div>
                 <div class="qualitykarmawrapper">
                     <label class="qualitylabel">Karma</label>
@@ -1748,7 +1775,7 @@ make sure to enter what the spell is resisted with">
                     <label class="qualitylabel">Name</label>
                 </div>
                 <div class="qualitydescriptionwrapper">
-                    <label class="qualitylabel">Description</label>
+                    <label class="qualitylabel">Rating</label>
                 </div>
                 <div class="qualitykarmawrapper">
                     <label class="qualitylabel">Karma</label>
@@ -1788,7 +1815,10 @@ make sure to enter what the spell is resisted with">
                     <label class="warelabel">Name</label>
                 </div>
                 <div class="waredescriptionwrapper">
-                    <label class="warelabel">Description</label>
+                    <label class="warelabel">Rating</label>
+                </div>
+                <div class="waregradewrapper">
+                    <label class="warelabel">Focus</label>
                 </div>
                 <div class="wareessencewrapper">
                     <label class="warelabel">Adept PP</label>
@@ -1805,6 +1835,9 @@ make sure to enter what the spell is resisted with">
                     <div class="waredescriptionwrapper">
                         <input type="text" name="attr_powerdescription" title="Description of the Adept Power">
                     </div>
+                    <div class="waregradewrapper">
+                        <input type="text" name="attr_powerfocus" title="Is this Power on a Focus or from your Mentor Spirit?">
+                    </div>
                     <div class="wareessencewrapper">
                         <input type="text" name="attr_powerpoints" title="Power Point Cost of the Adept Power">
                     </div>
@@ -1828,7 +1861,10 @@ make sure to enter what the spell is resisted with">
                     <label class="warelabel">Name</label>
                 </div>
                 <div class="waredescriptionwrapper">
-                    <label class="warelabel">Description</label>
+                    <label class="warelabel">Rating</label>
+                </div>
+                <div class="waregradewrapper">
+                    <label class="warelabel">Grade</label>
                 </div>
                 <div class="wareessencewrapper">
                     <label class="warelabel">Essence</label>
@@ -1845,6 +1881,9 @@ make sure to enter what the spell is resisted with">
                     <div class="waredescriptionwrapper">
                         <input type="text" name="attr_waredescription" title="Description of the Cyber-/Bioware">
                     </div>
+                    <div class="waregradewrapper">
+                        <input type="text" name="attr_waregrade" title="Grade of the Cyber-/Bioware">
+                    </div>
                     <div class="wareessencewrapper">
                         <input type="text" name="attr_warekarma" title="Essence Cost of the Cyber-/Bioware">
                     </div>
@@ -2061,9 +2100,9 @@ make sure to enter what the spell is resisted with">
                         <input type="text" name="attr_mskillbonus" value="0" title="Bonuses from Magic or Gear">
                     </div>
                     <div class="mskillspecwrapper">
-                        <input type="checkbox" class="mskillspecticker hiddencheckbox" name="attr_mskillspecticker" title="Check if Skill has a Specialization">
+                        <input type="checkbox" class="mskillspecticker hiddencheckbox" name="attr_mskillspec" value="none" title="Check if Skill has a Specialization" checked>
                         <div class="checkboxticker mskillspecunticked"></div>
-                        <input type="text" name="attr_mskillspec" title="Name of the Specialization, input '0' to disable">
+                        <input type="text" name="attr_mskillspec" title="Name of the Specialization, input 'none' to disable">
                     </div>
                     <div class="mskilllimitwrapper">
                         <select name="attr_mskilllimit">
@@ -2081,7 +2120,7 @@ make sure to enter what the spell is resisted with">
                         <input type="number" name="attr_mskilldicepool" value="@{mskillattr}_total}+@{mskillrating}+@{mskillbonus}+@{runningsilent}+@{hotsim}" title="Base Dicepool" disabled="true">
                     </div>
                     <div class="mskillbuttonwrapper">
-                        <input type="checkbox" class="mskillshowspec" name="attr_mskillspecticker" title="Check if Skill has a Specialization">
+                        <input type="checkbox" class="mskillshowspec" name="attr_mskillspec" value="none" title="Check if Skill has a Specialization">
                         <button type="roll" class="rollbuttonspec" name="roll_mskillroll" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{mskillname}}}{{val1=@{mskillattr}_name}}}{{val1_num=[[@{mskillattr}_total}]]}}{{val2=@{mskillname}}}{{val2_num=[[@{mskillrating}]]}}{{val3=Specialized}}{{val3_num=[[?{Specialization @{mskillspec} applies|Yes,2|No,0}]]}}{{val4=HotSim/Silent}}{{val4_num=[[@{runningsilent}+@{hotsim}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{mskilllimit}_name}}}{{limit_num=[[@{mskilllimit}_total}]]}}{{result=[[(@{mskilldicepool}+?{Specialization @{mskillspec} applies|yes,2|no,0}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{mskilllimit}_total}]]]]}}{{description=@{mskillnotes}}" />
                         <button type="roll" class="rollbuttonnospec" name="roll_mskillroll" title="Click to Roll" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=@{mskillname}}}{{val1=@{mskillattr}_name}}}{{val1_num=[[@{mskillattr}_total}]]}}{{val2=@{mskillname}}}{{val2_num=[[@{mskillrating}]]}}{{val3=HotSim/Silent}}{{val3_num=[[@{runningsilent}+@{hotsim}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=@{mskilllimit}_name}}}{{limit_num=[[@{mskilllimit}_total}]]}}{{result=[[(@{mskilldicepool}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{mskilllimit}_total}]]]]}}{{description=@{mskillnotes}}" />
                    </div>
@@ -2344,7 +2383,8 @@ Click again to switch to Manual and Remote">
                                 <input type="text" name="attr_vehicleweaponbonus" title="Any Bonuses to Weapon Skill"> 
                             </div>
                             <div class="weaponrollwrapper">
-                                <button type="roll" class="ammoroll" name="roll_vehicleweaponroll" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname}}}{{val1=Attribute}}{{val1_num=[[?{Attribute|Agility,@{agi_total}|Logic,@{log_total}|Pilot,@{vehiclepilot}}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[?{Skill|Gunnery,@{vehicleweaponskill}|Autosoft,@{vehicleweaponautosoft}}+@{vehicleweaponbonus}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[?{Apply Woundpenalty|yes,1|no,0}*(@{wound_total})]]}}{{limit=Accuracy/Sensor}}{{limit_num=[[?{Limit|Accuracy,@{vehicleweaponaccuracy}|Sensor,@{vehiclesens}}]]}}{{result=[[(?{Attribute}+?{Skill}+@{vehicleweaponbonus}-[[?{Apply Woundpenalty|yes,1|no,0}*(@{wound_total})]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[?{Limit}]]]]}}{{after1=DV([[@{vehicleweapondv}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}]]}}" /> 
+                                <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleweaponrollautopilot" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft}+?{Situational Modifiers})d6cs>5>5sdkh[[@{vehicleweaponaccuracy}]]]]}}{{after1=DV([[@{vehicleweapondv}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}]]}}" /> 
+                                <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleweaponrollpilot" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname}}}{{val1=Attribute}}{{val1_num=[[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{vehicleweaponskill}+@{vehicleweaponbonus}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[([[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]+@{vehicleweaponskill}+@{vehicleweaponbonus}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{vehicleweaponaccuracy}+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]]]}}{{after1=DV([[@{vehicleweapondv}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}]]}}" /> 
                             </div>
                             <input class="vehicleweaponcheckbox hiddencheckbox" type="checkbox" name="attr_vehicleshowweaponnotes" title="Need more Space?">
                             <div class="checkboxticker vehicleweaponunticked"></div>
@@ -2380,54 +2420,58 @@ Click again to switch to Manual and Remote">
                             </div>
                             <div class="vehicleammorow">
                                 <div class="ammonamewrapper">
-                                    <input type="text" name="attr_vehicleammoname" title="Name of the Ammunition"> 
+                                    <input type="text" name="attr_vehicleammoname1" title="Name of the Ammunition"> 
                                 </div>
                                 <div class="ammonumberwrapper">
-                                    <input type="number" name="attr_vehicleammonumber" title="How many still left in the Clip/Drum/etc"> 
+                                    <input type="number" name="attr_vehicleammonumber1" title="How many still left in the Clip/Drum/etc"> 
                                 </div>
                                 <div class="ammodvwrapper">
-                                    <input type="text" name="attr_vehicleammodv" value="0" title="DV change from the Ammunition"> 
+                                    <input type="text" name="attr_vehicleammodv1" value="0" title="DV change from the Ammunition"> 
                                 </div>
                                 <div class="ammoapwrapper">
-                                    <input type="text" name="attr_vehicleammoap" value="0" title="AP change from the Ammunition"> 
+                                    <input type="text" name="attr_vehicleammoap1" value="0" title="AP change from the Ammunition"> 
                                 </div>
                                 <div class="ammoaccwrapper">
-                                    <input type="text" name="attr_vehicleammoacc" value="0" title="Accuracy change from the Ammunition"> 
+                                    <input type="text" name="attr_vehicleammoacc1" value="0" title="Accuracy change from the Ammunition"> 
                                 </div>
                                 <div class="ammodescriptionwrapper">
-                                    <input type="text" name="attr_vehicleammodescription" title="Additional Description"> 
+                                    <input type="text" name="attr_vehicleammodescription1" title="Additional Description"> 
                                 </div>
                                 <div class="ammorollwrapper">
-                                    <button type="roll" class="ammoroll" name="roll_vehicleweaponammorollsimple" title="Fire the Weapon as a Simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname}}}{{val1=Attribute}}{{val1_num=[[?{Attribute|Agility,@{agi_total}|Logic,@{log_total}|Pilot,@{vehiclepilot}}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[?{Skill|Gunnery,@{vehicleweaponskill}|Autosoft,@{vehicleweaponautosoft}}+@{vehicleweaponbonus}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[?{Apply Woundpenalty|yes,1|no,0}*(@{wound_total})]]}}{{limit=Accuracy/Sensor}}{{limit_num=[[?{Limit|Accuracy,@{vehicleweaponaccuracy}|Sensor,@{vehiclesens}}+@{vehicleammoacc}]]}}{{result=[[(?{Attribute}+?{Skill}+@{vehicleweaponbonus}-[[?{Apply Woundpenalty|yes,1|no,0}*(@{wound_total})]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[?{Limit}+@{vehicleammoacc}]]]]}}{{after1=DV(@{vehicleammodv}+@{vehicleweapondv}) ~ AP}}{{after1_num=[[@{vehicleweaponap}+@{vehicleammoap}]]}}{{after2=@{vehicleammoname} Rounds}}{{after2_num=[[@{vehicleweaponmode}-floor(@{vehicleweaponmode}/10)*10]]}}{{description=@{vehicleammodescription}}}" /> 
+                                    <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleweaponrollsimpleautopilot1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc1}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft}+?{Situational Modifiers})d6cs>5>5sdkh[[@{vehicleweaponaccuracy}+@{vehicleammoacc1}]]]]}}{{after1=DV([[@{vehicleweapondv}+@{vehicleammodv1}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+@{vehicleammoap1}]]}}{{after2=@{vehicleammoname1} Rounds}}{{after2_num=[[@{vehicleweaponmode}-floor(@{vehicleweaponmode}/10)*10]]}}{{description=@{vehicleammodescription1}}}" /> 
+                                    <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleweaponrollsimplepilot1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname}}}{{val1=Attribute}}{{val1_num=[[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{vehicleweaponskill}+@{vehicleweaponbonus}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc1}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[([[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]+@{vehicleweaponskill}+@{vehicleweaponbonus}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{vehicleweaponaccuracy}+@{vehicleammoacc1}+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]]]}}{{after1=DV([[@{vehicleweapondv}+(@{vehicleammodv1})]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+(@{vehicleammoap1})]]}}{{after2=@{vehicleammoname1} Rounds}}{{after2_num=[[@{vehicleweaponmode}-floor(@{vehicleweaponmode}/10)*10]]}}{{description=@{vehicleammodescription1}}}" /> 
                                 </div>
                                 <div class="ammorollwrapper">
-                                    <button type="roll" class="ammoroll" name="roll_vehicleweaponammorollcomplex" title="Fire the Weapon as a Complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname}}}{{val1=Attribute}}{{val1_num=[[?{Attribute|Agility,@{agi_total}|Logic,@{log_total}|Pilot,@{vehiclepilot}}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[?{Skill|Gunnery,@{vehicleweaponskill}|Autosoft,@{vehicleweaponautosoft}}+@{vehicleweaponbonus}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[?{Apply Woundpenalty|yes,1|no,0}*(@{wound_total})]]}}{{limit=Accuracy/Sensor}}{{limit_num=[[?{Limit|Accuracy,@{vehicleweaponaccuracy}|Sensor,@{vehiclesens}}+@{vehicleammoacc}]]}}{{result=[[(?{Attribute}+?{Skill}+@{vehicleweaponbonus}-[[?{Apply Woundpenalty|yes,1|no,0}*(@{wound_total})]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[?{Limit}+@{vehicleammoacc}]]]]}}{{after1=DV(@{vehicleammodv}+@{vehicleweapondv}) ~ AP}}{{after1_num=[[@{vehicleweaponap}+@{vehicleammoap}]]}}{{after2=@{vehicleammoname} Rounds}}{{after2_num=[[floor(@{vehicleweaponmode}/10)]]}}{{description=@{vehicleammodescription}}}" /> 
+                                    <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleweaponrollcomplexautopilot1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc1}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft}+?{Situational Modifiers})d6cs>5>5sdkh[[@{vehicleweaponaccuracy}+@{vehicleammoacc1}]]]]}}{{after1=DV([[@{vehicleammodv1}+@{vehicleweapondv}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+@{vehicleammoap1}]]}}{{after2=@{vehicleammoname1} Rounds}}{{after2_num=[[floor(@{vehicleweaponmode}/10)]]}}{{description=@{vehicleammodescription1}}}" /> 
+                                    <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleweaponrollocomplexpilot1" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname}}}{{val1=Attribute}}{{val1_num=[[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{vehicleweaponskill}+@{vehicleweaponbonus}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc1}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[([[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]+@{vehicleweaponskill}+@{vehicleweaponbonus}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{vehicleweaponaccuracy}+@{vehicleammoacc1}+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]]]}}{{after1=DV([[@{vehicleammodv1}+(@{vehicleweapondv})]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+(@{vehicleammoap1})]]}}{{after2=@{vehicleammoname1} Rounds}}{{after2_num=[[floor(@{vehicleweaponmode}/10)]]}}{{description=@{vehicleammodescription1}}}" /> 
                                 </div>
                             </div>
                             <div class="vehicleammorow">
                                 <div class="ammonamewrapper">
-                                    <input type="text" name="attr_vehicleammoname" title="Name of the Ammunition"> 
+                                    <input type="text" name="attr_vehicleammoname2" title="Name of the Ammunition"> 
                                 </div>
                                 <div class="ammonumberwrapper">
-                                    <input type="number" name="attr_vehicleammonumber" title="How many still left in the Clip/Drum/etc"> 
+                                    <input type="number" name="attr_vehicleammonumber2" title="How many still left in the Clip/Drum/etc"> 
                                 </div>
                                 <div class="ammodvwrapper">
-                                    <input type="text" name="attr_vehicleammodv" value="0" title="DV change from the Ammunition"> 
+                                    <input type="text" name="attr_vehicleammodv2" value="0" title="DV change from the Ammunition"> 
                                 </div>
                                 <div class="ammoapwrapper">
-                                    <input type="text" name="attr_vehicleammoap" value="0" title="AP change from the Ammunition"> 
+                                    <input type="text" name="attr_vehicleammoap2" value="0" title="AP change from the Ammunition"> 
                                 </div>
                                 <div class="ammoaccwrapper">
-                                    <input type="text" name="attr_vehicleammoacc" value="0" title="Accuracy change from the Ammunition"> 
+                                    <input type="text" name="attr_vehicleammoacc2" value="0" title="Accuracy change from the Ammunition"> 
                                 </div>
                                 <div class="ammodescriptionwrapper">
-                                    <input type="text" name="attr_vehicleammodescription" title="Additional Description"> 
+                                    <input type="text" name="attr_vehicleammodescription2" title="Additional Description"> 
                                 </div>
                                 <div class="ammorollwrapper">
-                                    <button type="roll" class="ammoroll" name="roll_vehicleweaponammorollsimple" title="Fire the Weapon as a Simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname}}}{{val1=Attribute}}{{val1_num=[[?{Attribute|Agility,@{agi_total}|Logic,@{log_total}|Pilot,@{vehiclepilot}}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[?{Skill|Gunnery,@{vehicleweaponskill}|Autosoft,@{vehicleweaponautosoft}}+@{vehicleweaponbonus}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{mod_num=?{Situational Modifiers|0}}}{{wounds_num=[[?{Apply Woundpenalty|yes,1|no,0}*(@{wound_total})]]}}{{limit=Accuracy/Sensor}}{{limit_num=[[?{Limit|Accuracy,@{vehicleweaponaccuracy}|Sensor,@{vehiclesens}}+@{vehicleammoacc}]]}}{{result=[[(?{Attribute}+?{Skill}+@{vehicleweaponbonus}-[[?{Apply Woundpenalty|yes,1|no,0}*(@{wound_total})]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[?{Limit}+@{vehicleammoacc}]]]]}}{{after1=DV(@{vehicleammodv}+@{vehicleweapondv}) ~ AP}}{{after1_num=[[@{vehicleweaponap}+@{vehicleammoap}]]}}{{after2=@{vehicleammoname} Rounds}}{{after2_num=[[@{vehicleweaponmode}-floor(@{vehicleweaponmode}/10)*10]]}}{{description=@{vehicleammodescription}}}" /> 
+                                    <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleweaponrollsimpleautopilot2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc2}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft}+?{Situational Modifiers})d6cs>5>5sdkh[[@{vehicleweaponaccuracy}+@{vehicleammoacc2}]]]]}}{{after1=DV([[@{vehicleweapondv}+@{vehicleammodv2}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+@{vehicleammoap2}]]}}{{after2=@{vehicleammoname2} Rounds}}{{after2_num=[[@{vehicleweaponmode}-floor(@{vehicleweaponmode}/10)*10]]}}{{description=@{vehicleammodescription2}}}" /> 
+                                    <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleweaponrollsimplepilot2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname}}}{{val1=Attribute}}{{val1_num=[[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{vehicleweaponskill}+@{vehicleweaponbonus}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc2}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[([[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]+@{vehicleweaponskill}+@{vehicleweaponbonus}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{vehicleweaponaccuracy}+@{vehicleammoacc2}+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]]]}}{{after1=DV([[@{vehicleweapondv}+(@{vehicleammodv2})]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+(@{vehicleammoap2})]]}}{{after2=@{vehicleammoname2} Rounds}}{{after2_num=[[@{vehicleweaponmode}-floor(@{vehicleweaponmode}/10)*10]]}}{{description=@{vehicleammodescription2}}}" /> 
                                 </div>
                                 <div class="ammorollwrapper">
-                                    <button type="roll" class="ammoroll" name="roll_vehicleweaponammorollcomplex" title="Fire the Weapon as a Complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname}}}{{val1=Attribute}}{{val1_num=[[?{Attribute|Agility,@{agi_total}|Logic,@{log_total}|Pilot,@{vehiclepilot}}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[?{Skill|Gunnery,@{vehicleweaponskill}|Autosoft,@{vehicleweaponautosoft}}+@{vehicleweaponbonus}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{mod_num=?{Situational Modifiers|0}}}{{wounds_num=[[?{Apply Woundpenalty|yes,1|no,0}*(@{wound_total})]]}}{{limit=Accuracy/Sensor}}{{limit_num=[[?{Limit|Accuracy,@{vehicleweaponaccuracy}|Sensor,@{vehiclesens}}+@{vehicleammoacc}]]}}{{result=[[(?{Attribute}+?{Skill}+@{vehicleweaponbonus}-[[?{Apply Woundpenalty|yes,1|no,0}*(@{wound_total})]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[?{Limit}+@{vehicleammoacc}]]]]}}{{after1=DV(@{vehicleammodv}+@{vehicleweapondv}) ~ AP}}{{after1_num=[[@{vehicleweaponap}+@{vehicleammoap}]]}}{{after2=@{vehicleammoname} Rounds}}{{after2_num=[[floor(@{vehicleweaponmode}/10)]]}}{{description=@{vehicleammodescription}}}" /> 
+                                    <button type="roll" class="vehicleroll autopilotroll" name="roll_vehicleweaponrollcomplexautopilot2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}{{roll_name=an Attack with @{vehicleweaponname}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Autosoft}}{{val2_num=[[@{vehicleweaponautosoft}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc2}]]}}{{result=[[(@{vehiclepilot}+@{vehicleweaponautosoft}+?{Situational Modifiers})d6cs>5>5sdkh[[@{vehicleweaponaccuracy}+@{vehicleammoacc2}]]]]}}{{after1=DV([[@{vehicleammodv2}+@{vehicleweapondv}]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+@{vehicleammoap2}]]}}{{after2=@{vehicleammoname2} Rounds}}{{after2_num=[[floor(@{vehicleweaponmode}/10)]]}}{{description=@{vehicleammodescription2}}}" /> 
+                                    <button type="roll" class="vehicleroll pilotroll" name="roll_vehicleweaponrollocomplexpilot2" title="Fire the Weapon" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{vehiclename}'s @{vehicleweaponname}}}{{val1=Attribute}}{{val1_num=[[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]}}{{val2=Gunnery-Skill}}{{val2_num=[[@{vehicleweaponskill}+@{vehicleweaponbonus}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{vehicleweaponrc}+1+@{vehiclebody}]]}}{{val4=Hot Sim/Silent/CR}}{{val4_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{vehicleweaponaccuracy}+@{vehicleammoacc2}]]}}{{limit_mod=[[[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{result=[[([[ceil(@{vehiclemode}/5)*@{log_total}+(1-ceil(@{vehiclemode}/5))*@{agi_total}]]+@{vehicleweaponskill}+@{vehicleweaponbonus}+[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{vehicleweaponaccuracy}+@{vehicleammoacc2}+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]]]}}{{after1=DV([[@{vehicleammodv2}+(@{vehicleweapondv})]]) ~ AP}}{{after1_num=[[@{vehicleweaponap}+(@{vehicleammoap2})]]}}{{after2=@{vehicleammoname2} Rounds}}{{after2_num=[[floor(@{vehicleweaponmode}/10)]]}}{{description=@{vehicleammodescription2}}}" /> 
                                 </div>
                             </div>
                         </div>
@@ -2807,10 +2851,10 @@ Click again to switch to Manual and Remote">
                             <input type="text" name="attr_ammodescription1" title="Additional Description"> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple1" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory1}-Skill}}{{val2_num=[[@{weaponbonus1}+@{weaponskill1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+@{ammoacc1}]]}}{{result=[[(@{agi_total}+@{weaponskill1}+@{weaponbonus1}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy1}+@{ammoacc1}]]]]}}{{after1=AP([[@{weaponap1}+@{ammoap1}]]) ~ DV}}{{after1_num=[[@{weapondv1}+@{ammodv1}]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[@{weaponmode1}-floor(@{weaponmode1}/10)*10]]}}{{description=@{ammodescription1}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple1" title="Fire the Weapon as a simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory1}-Skill}}{{val2_num=[[@{weaponbonus1}+@{weaponskill1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+@{ammoacc1}]]}}{{result=[[(@{agi_total}+@{weaponskill1}+@{weaponbonus1}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy1}+@{ammoacc1}]]]]}}{{after1=AP([[@{weaponap1}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[@{weaponmode1}-floor(@{weaponmode1}/10)*10]]}}{{description=@{ammodescription1}}}" /> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex1" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory1}-Skill}}{{val2_num=[[@{weaponbonus1}+@{weaponskill1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+@{ammoacc1}]]}}{{result=[[(@{agi_total}+@{weaponskill1}+@{weaponbonus1}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy1}+@{ammoacc1}]]]]}}{{after1=AP([[@{weaponap1}+@{ammoap1}]]) ~ DV}}{{after1_num=[[@{weapondv1}+@{ammodv1}]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[floor(@{weaponmode1}/10)]]}}{{description=@{ammodescription1}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex1" title="Fire the Weapon as a complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname1}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory1}-Skill}}{{val2_num=[[@{weaponbonus1}+@{weaponskill1}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc1}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy1}+@{ammoacc1}]]}}{{result=[[(@{agi_total}+@{weaponskill1}+@{weaponbonus1}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy1}+@{ammoacc1}]]]]}}{{after1=AP([[@{weaponap1}+(@{ammoap1})]]) ~ DV}}{{after1_num=[[@{weapondv1}+(@{ammodv1})]]}}{{after1dmg=@{ammodmgtype1}}}{{after2=@{ammoname1} Rounds}}{{after2=@{ammoname1} Rounds}}{{after2_num=[[floor(@{weaponmode1}/10)]]}}{{description=@{ammodescription1}}}" /> 
                         </div>
                     </div>
                 </fieldset>
@@ -2942,10 +2986,10 @@ Click again to switch to Manual and Remote">
                             <input type="text" name="attr_ammodescription2" title="Additional Description"> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple2" title="Fire the Weapon as a Simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory2}-Skill}}{{val2_num=[[@{weaponbonus2}+@{weaponskill2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+@{ammoacc2}]]}}{{result=[[(@{agi_total}+@{weaponskill2}+@{weaponbonus2}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy2}+@{ammoacc2}]]]]}}{{after1=AP([[@{weaponap2}+@{ammoap2}]]) ~ DV}}{{after1_num=[[@{weapondv2}+@{ammodv2}]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=@{ammoname2} Rounds}}{{after2_num=[[@{weaponmode2}-floor(@{weaponmode2}/10)*10]]}}{{description=@{ammodescription2}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple2" title="Fire the Weapon as a Simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory2}-Skill}}{{val2_num=[[@{weaponbonus2}+@{weaponskill2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+@{ammoacc2}]]}}{{result=[[(@{agi_total}+@{weaponskill2}+@{weaponbonus2}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy2}+@{ammoacc2}]]]]}}{{after1=AP([[@{weaponap2}+@{ammoap2}]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv2})]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=@{ammoname2} Rounds}}{{after2_num=[[@{weaponmode2}-floor(@{weaponmode2}/10)*10]]}}{{description=@{ammodescription2}}}" /> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex2" title="Fire the Weapon as a Complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory2}-Skill}}{{val2_num=[[@{weaponbonus2}+@{weaponskill2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+@{ammoacc2}]]}}{{result=[[(@{agi_total}+@{weaponskill2}+@{weaponbonus2}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy2}+@{ammoacc2}]]]]}}{{after1=AP([[@{weaponap2}+@{ammoap2}]]) ~ DV}}{{after1_num=[[@{weapondv2}+@{ammodv2}]]}}{{after1dmg=@{ammodmgtype2}}}{{after2_num=[[floor(@{weaponmode2}/10)]]}}{{description=@{ammodescription2}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex2" title="Fire the Weapon as a Complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname2}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory2}-Skill}}{{val2_num=[[@{weaponbonus2}+@{weaponskill2}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc2}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy2}+@{ammoacc2}]]}}{{result=[[(@{agi_total}+@{weaponskill2}+@{weaponbonus2}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy2}+@{ammoacc2}]]]]}}{{after1=AP([[@{weaponap2}+@{ammoap2}]]) ~ DV}}{{after1_num=[[@{weapondv2}+(@{ammodv2})]]}}{{after1dmg=@{ammodmgtype2}}}{{after2=@{ammoname2} Rounds}}{{after2_num=[[floor(@{weaponmode2}/10)]]}}{{description=@{ammodescription2}}}" /> 
                         </div>
                     </div>
                 </fieldset>
@@ -3074,10 +3118,10 @@ Click again to switch to Manual and Remote">
                             <input type="text" name="attr_ammodescription3" title="Additional Description"> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple3" title="Fire the Weapon as a Simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory3}-Skill}}{{val2_num=[[@{weaponbonus3}+@{weaponskill3}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+@{ammoacc3}]]}}{{result=[[(@{agi_total}+@{weaponskill3}+@{weaponbonus3}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy3}+@{ammoacc3}]]]]}}{{after1=AP([[@{weaponap3}+@{ammoap3}}]]) ~ DV}}{{after1_num=[[@{weapondv3}+@{ammodv3}]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[@{weaponmode3}-floor(@{weaponmode3}/10)*10]]}}{{description=@{ammodescription3}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple3" title="Fire the Weapon as a Simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory3}-Skill}}{{val2_num=[[@{weaponbonus3}+@{weaponskill3}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+@{ammoacc3}]]}}{{result=[[(@{agi_total}+@{weaponskill3}+@{weaponbonus3}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy3}+@{ammoacc3}]]]]}}{{after1=AP([[@{weaponap3}+(@{ammoap3})}]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{ammodv3})]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[@{weaponmode3}-floor(@{weaponmode3}/10)*10]]}}{{description=@{ammodescription3}}}" /> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex3" title="Fire the Weapon as a Complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory3}-Skill}}{{val2_num=[[@{weaponbonus3}+@{weaponskill3}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+@{ammoacc3}]]}}{{result=[[(@{agi_total}+@{weaponskill3}+@{weaponbonus3}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy3}+@{ammoacc3}]]]]}}{{after1=AP([[@{weaponap3}+@{ammoap3}}]]) ~ DV}}{{after1_num=[[@{weapondv3}+@{ammodv3}]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[floor(@{weaponmode3}/10)]]}}{{description=@{ammodescription3}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex3" title="Fire the Weapon as a Complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname3}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory3}-Skill}}{{val2_num=[[@{weaponbonus3}+@{weaponskill3}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc3}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy3}+@{ammoacc3}]]}}{{result=[[(@{agi_total}+@{weaponskill3}+@{weaponbonus3}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy3}+@{ammoacc3}]]]]}}{{after1=AP([[@{weaponap3}+(@{ammoap3})}]]) ~ DV}}{{after1_num=[[@{weapondv3}+(@{ammodv3})]]}}{{after1dmg=@{ammodmgtype3}}}{{after2=@{ammoname3} Rounds}}{{after2_num=[[floor(@{weaponmode3}/10)]]}}{{description=@{ammodescription3}}}" /> 
                         </div>
                     </div>
                 </fieldset>
@@ -3209,10 +3253,10 @@ Click again to switch to Manual and Remote">
                             <input type="text" name="attr_ammodescription4" title="Additional Description"> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple4" title="Fire the Weapon as a Simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory4}-Skill}}{{val2_num=[[@{weaponbonus4}+@{weaponskill4}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+@{ammoacc4}]]}}{{result=[[(@{agi_total}+@{weaponskill4}+@{weaponbonus4}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy4}+@{ammoacc4}]]]]}}{{after1=AP([[@{weaponap4}+@{ammoap4}}]]) ~ DV}}{{after1_num=[[@{weapondv4}+@{ammodv4}]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4}}}{{after2_num=[[@{weaponmode4}-floor(@{weaponmode4}/10)*10]]}}{{description=@{ammodescription4}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple4" title="Fire the Weapon as a Simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory4}-Skill}}{{val2_num=[[@{weaponbonus4}+@{weaponskill4}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+@{ammoacc4}]]}}{{result=[[(@{agi_total}+@{weaponskill4}+@{weaponbonus4}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy4}+@{ammoacc4}]]]]}}{{after1=AP([[@{weaponap4}+(@{ammoap4})}]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{ammodv4})]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4}}}{{after2_num=[[@{weaponmode4}-floor(@{weaponmode4}/10)*10]]}}{{description=@{ammodescription4}}}" /> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammoroll4complex" title="Fire the Weapon as a Complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory4}-Skill}}{{val2_num=[[@{weaponbonus4}+@{weaponskill4}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+@{ammoacc4}]]}}{{result=[[(@{agi_total}+@{weaponskill4}+@{weaponbonus4}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy4}+@{ammoacc4}]]]]}}{{after1=AP([[@{weaponap4}+@{ammoap4}}]]) ~ DV}}{{after1_num=[[@{weapondv4}+@{ammodv4}]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4}}}{{after2_num=[[floor(@{weaponmode4}/10)]]}}{{description=@{ammodescription4}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammoroll4complex" title="Fire the Weapon as a Complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname4}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory4}-Skill}}{{val2_num=[[@{weaponbonus4}+@{weaponskill4}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc4}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy4}+@{ammoacc4}]]}}{{result=[[(@{agi_total}+@{weaponskill4}+@{weaponbonus4}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy4}+@{ammoacc4}]]]]}}{{after1=AP([[@{weaponap4}+(@{ammoap4})}]]) ~ DV}}{{after1_num=[[@{weapondv4}+(@{ammodv4})]]}}{{after1dmg=@{ammodmgtype4}}}{{after2=@{ammoname4}}}{{after2_num=[[floor(@{weaponmode4}/10)]]}}{{description=@{ammodescription4}}}" /> 
                         </div>
                     </div>
                 </fieldset>
@@ -3344,10 +3388,10 @@ Click again to switch to Manual and Remote">
                             <input type="text" name="attr_ammodescription5" title="Additional Description"> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple5" title="Fire the Weapon as a Simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory5}-Skill}}{{val2_num=[[@{weaponbonus5}+@{weaponskill5}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+@{ammoacc5}]]}}{{result=[[(@{agi_total}+@{weaponskill5}+@{weaponbonus5}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy5}+@{ammoacc5}]]]]}}{{after1=AP([[@{weaponap5}+@{ammoap5}}]]) ~ DV}}{{after1_num=[[@{weapondv5}+@{ammodv5}]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5}}}{{after2_num=[[@{weaponmode5}-floor(@{weaponmode5}/10)*10]]}}{{description=@{ammodescription5}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple5" title="Fire the Weapon as a Simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory5}-Skill}}{{val2_num=[[@{weaponbonus5}+@{weaponskill5}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+@{ammoacc5}]]}}{{result=[[(@{agi_total}+@{weaponskill5}+@{weaponbonus5}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy5}+@{ammoacc5}]]]]}}{{after1=AP([[@{weaponap5}+(@{ammoap5}})]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{ammodv5})]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5}}}{{after2_num=[[@{weaponmode5}-floor(@{weaponmode5}/10)*10]]}}{{description=@{ammodescription5}}}" /> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex5" title="Fire the Weapon as a Simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory5}-Skill}}{{val2_num=[[@{weaponbonus5}+@{weaponskill5}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+@{ammoacc5}]]}}{{result=[[(@{agi_total}+@{weaponskill5}+@{weaponbonus5}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy5}+@{ammoacc5}]]]]}}{{after1=AP([[@{weaponap5}+@{ammoap5}}]]) ~ DV}}{{after1_num=[[@{weapondv5}+@{ammodv5}]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5}}}{{after2_num=[[floor(@{weaponmode5}/10)]]}}{{description=@{ammodescription5}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex5" title="Fire the Weapon as a Simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname5}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory5}-Skill}}{{val2_num=[[@{weaponbonus5}+@{weaponskill5}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc5}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy5}+@{ammoacc5}]]}}{{result=[[(@{agi_total}+@{weaponskill5}+@{weaponbonus5}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy5}+@{ammoacc5}]]]]}}{{after1=AP([[@{weaponap5}+(@{ammoap5})}]]) ~ DV}}{{after1_num=[[@{weapondv5}+(@{ammodv5})]]}}{{after1dmg=@{ammodmgtype5}}}{{after2=@{ammoname5}}}{{after2_num=[[floor(@{weaponmode5}/10)]]}}{{description=@{ammodescription5}}}" /> 
                         </div>
                     </div>
                 </fieldset>
@@ -3479,10 +3523,10 @@ Click again to switch to Manual and Remote">
                             <input type="text" name="attr_ammodescription6" title="Additional Description"> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple6" title="Fire the Weapon as a Simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory6}-Skill}}{{val2_num=[[@{weaponbonus6}+@{weaponskill6}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+@{ammoacc6}]]}}{{result=[[(@{agi_total}+@{weaponskill6}+@{weaponbonus6}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy6}+@{ammoacc6}]]]]}}{{after1=AP([[@{weaponap6}+@{ammoap6}}]]) ~ DV}}{{after1_num=[[@{weapondv6}+@{ammodv6}]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6}}}{{after2_num=[[@{weaponmode6}-floor(@{weaponmode6}/10)*10]]}}{description=@{ammodescription6}}}{{description=@{ammodescription6}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollsimple6" title="Fire the Weapon as a Simple Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory6}-Skill}}{{val2_num=[[@{weaponbonus6}+@{weaponskill6}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+@{ammoacc6}]]}}{{result=[[(@{agi_total}+@{weaponskill6}+@{weaponbonus6}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy6}+@{ammoacc6}]]]]}}{{after1=AP([[@{weaponap6}+(@{ammoap6})}]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{ammodv6})]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6}}}{{after2_num=[[@{weaponmode6}-floor(@{weaponmode6}/10)*10]]}}{description=@{ammodescription6}}}{{description=@{ammodescription6}}}" /> 
                         </div>
                         <div class="ammorollwrapper">
-                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex6" title="Fire the Weapon as a Complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory6}-Skill}}{{val2_num=[[@{weaponbonus6}+@{weaponskill6}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+@{ammoacc6}]]}}{{result=[[(@{agi_total}+@{weaponskill6}+@{weaponbonus6}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy6}+@{ammoacc6}]]]]}}{{after1=AP([[@{weaponap6}+@{ammoap6}}]]) ~ DV}}{{after1_num=[[@{weapondv6}+@{ammodv6}]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6}}}{{after2_num=[[floor(@{weaponmode6}/10)]]}}{{description=@{ammodescription6}}}" /> 
+                            <button type="roll" class="ammoroll" name="roll_weaponammorollcomplex6" title="Fire the Weapon as a Complex Action with this Ammunition" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=an Attack with @{weaponname6}}}{{val1=Agility}}{{val1_num=[[@{agi_total}]]}}{{val2=@{weaponcategory6}-Skill}}{{val2_num=[[@{weaponbonus6}+@{weaponskill6}]]}}{{val3=Recoil Compensation}}{{val3_num=[[@{weaponrc6}+ceil((@{str_total})/3)+1]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{wounds_num=[[@{wound_total}]]}}{{limit=Accuracy}}{{limit_num=[[@{weaponaccuracy6}+@{ammoacc6}]]}}{{result=[[(@{agi_total}+@{weaponskill6}+@{weaponbonus6}-[[@{wound_total}]]+?{Situational Modifiers|0})d6cs>5>5sdkh[[@{weaponaccuracy6}+@{ammoacc6}]]]]}}{{after1=AP([[@{weaponap6}+(@{ammoap6})}]]) ~ DV}}{{after1_num=[[@{weapondv6}+(@{ammodv6})]]}}{{after1dmg=@{ammodmgtype6}}}{{after2=@{ammoname6}}}{{after2_num=[[floor(@{weaponmode6}/10)]]}}{{description=@{ammodescription6}}}" /> 
                         </div>
                     </div>
                 </fieldset>
@@ -3903,6 +3947,16 @@ Click again to switch to Manual and Remote">
              <td>> {{val6}}({{val6_num}})</td>
         </tr>
         {{/val6}}
+        {{#val7}}
+        <tr>
+             <td>> {{val7}}({{val7_num}})</td>
+        </tr>
+        {{/val7}}
+        {{#val8}}
+        <tr>
+             <td>> {{val8}}({{val8_num}})</td>
+        </tr>
+        {{/val8}}
         {{#mod_num}}
         <tr>
               <td>> Modifiers({{mod_num}})</td>