diff --git a/Cyberpunk Red Tabbed/cyberpunk-red-tabbed.html b/Cyberpunk Red Tabbed/cyberpunk-red-tabbed.html
index 59d59395d0..5c7391a689 100644
--- a/Cyberpunk Red Tabbed/cyberpunk-red-tabbed.html	
+++ b/Cyberpunk Red Tabbed/cyberpunk-red-tabbed.html	
@@ -748,6 +748,7 @@
                   <input
                     type="hidden"
                     name="attr_role_solo_precisionattack_calc"
+                    value="0"
                   />
                   Precision Attack (+<span
                     name="attr_role_solo_precisionattack_calc"
@@ -2987,7 +2988,7 @@
                 <input type="number" value="0" name="attr_evasionmodifier" />
                 <button
                   type="roll"
-                  value="&{template:skill}{{charactername=@{character_name}}} {{skillname=Evasion}} {{skillvalue=@{skill_evasion}}} {{statname=REF}} {{statvalue=@{stat_ref}}} {{finalmodifier=@{finalmodifier}}} {{roll=[[1d10 + @{skill_evasion} + @{stat_ref} + @{armor_penalty} + @{finalmodifier} + @{evasionmodifier}]]}} {{critroll=[[1d10]]}}"
+                  value="&{template:skill}{{charactername=@{character_name}}} {{skillname=Evasion}} {{skillvalue=@{skill_evasion}}} {{statname=DEX}} {{statvalue=@{stat_dex}}} {{finalmodifier=@{finalmodifier}}} {{roll=[[1d10 + @{skill_evasion} + @{stat_dex} + @{armor_penalty} + @{finalmodifier} + @{evasionmodifier}]]}} {{critroll=[[1d10]]}}"
                 >
                   Evasion
                 </button>
@@ -3155,7 +3156,7 @@
                   class="autofirebutton"
                   type="roll"
                   name="roll_autofire"
-                  value="&{template:attack}{{charactername=@{character_name}}}{{weapon=@{weaponname} (Autofire)}}{{specialrule=See full Autofire rules on p.173}}{{roll=[[1d10+@{skill_autofire}+@{stat_ref}+@{armor_penalty}+@{weaponmodifier}+@{finalmodifier}]]}}{{critroll=[[1d10]]}}"
+                  value="&{template:attack}{{charactername=@{character_name}}}{{weapon=@{weaponname} (Autofire)}}{{specialrule=See full Autofire rules on p.173}}{{roll=[[1d10+@{skill_autofire}+@{stat_ref}+@{armor_penalty}+@{weaponmodifier}+@{role_solo_precisionattack_calc}+@{finalmodifier}]]}}{{critroll=[[1d10]]}}"
                 >
                   Autofire
                 </button>
@@ -3168,14 +3169,14 @@
                   class="suppfirebutton"
                   type="roll"
                   name="roll_suppfire"
-                  value="&{template:attack}{{charactername=@{character_name}}}{{weapon=@{weaponname} (Suppressing Fire)}}{{specialrule=Opponents need to make a Concentration check. (See p.174)}}{{roll=[[1d10+@{skill_autofire}+@{stat_ref}+@{armor_penalty}+@{weaponmodifier}+@{finalmodifier}]]}}{{critroll=[[1d10]]}}"
+                  value="&{template:attack}{{charactername=@{character_name}}}{{weapon=@{weaponname} (Suppressing Fire)}}{{specialrule=Opponents need to make a Concentration check. (See p.174)}}{{roll=[[1d10+@{skill_autofire}+@{stat_ref}+@{armor_penalty}+@{weaponmodifier}+@{role_solo_precisionattack_calc}+@{finalmodifier}]]}}{{critroll=[[1d10]]}}"
                 >
                   Suppressing Fire
                 </button>
                 <button
                   type="roll"
                   name="roll_attack"
-                  value="&{template:attack}{{charactername=@{character_name}}}{{weapon=@{weaponname}}}{{roll=[[1d10+@{weaponskill}+@{armor_penalty}+@{weaponmodifier}+@{finalmodifier}]]}}{{critroll=[[1d10]]}}"
+                  value="&{template:attack}{{charactername=@{character_name}}}{{weapon=@{weaponname}}}{{roll=[[1d10+@{weaponskill}+@{armor_penalty}+@{weaponmodifier}+@{role_solo_precisionattack_calc}+@{finalmodifier}]]}}{{critroll=[[1d10]]}}"
                 >
                   Attack
                 </button>
@@ -3206,11 +3207,6 @@
               <div class="martialart">
                 <div class="columns">
                   <div class="column">
-                    <!--
-                    Roll20 won't allow us to just read values from the shared 
-                    repeating fieldset in roll templates, there needs to be an
-                    input field to actually give us a readable value to include.
-                    -->
                     <div style="display: none">
                       <input type="text" name="attr_skillname" />
                       <input type="number" name="attr_skillvalue" />
@@ -3301,7 +3297,7 @@
                   </div>
                   <div class="column">
                     <select name="attr_armor_penalty">
-                      <option value="0">0</option>
+                      <option value="0" selected="selected">0</option>
                       <option value="-2">-2</option>
                       <option value="-4">-4</option>
                     </select>
@@ -3702,7 +3698,7 @@
               <fieldset class="repeating_cyberinternal">
                 <div class="columns">
                   <div class="column label">Name</div>
-                  <div lass="column column-5">
+                  <div class="column column-5">
                     <input type="text" name="attr_cyberwarename" />
                   </div>
                 </div>