diff --git a/Shadowrun5th/Shadowrun5th.html b/Shadowrun5th/Shadowrun5th.html
index 40fea5f18a..db57d7a9a4 100644
--- a/Shadowrun5th/Shadowrun5th.html
+++ b/Shadowrun5th/Shadowrun5th.html
@@ -9306,7 +9306,7 @@ Click again to switch to Manual and Remote">
                                         <input type="text" value="0" name="attr_vehiclemaneuversoft" title="Maneuver Autosoft Rating for this Drone/Vehicle">
                                     </div>
                                     <button type="roll" class="vehicleroll autopilotroll" name="roll_vehiclemaneuverrollautopilot" title="Roll a Driving Test" value="@{gmroll}&{template:shadowrun}{{name=@{vehiclename}}}}{{roll_name=a Piloting Test with @{vehiclename}}}{{val1=Pilot}}{{val1_num=[[@{vehiclepilot}]]}}{{val2=Maneuver-Soft}}{{val2_num=[[@{vehiclemaneuversoft}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Limit}}{{limit_num=[[?{Limit|Handling,@{vehiclehand}|Speed,@{vehiclespeed}}]]}}{{result=[[(@{vehiclepilot}+@{vehiclemaneuversoft}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Limit})]]]]}}"></button>
-                                    <button type="roll" class="vehicleroll pilotroll" name="roll_vehiclemaneuverrollpilot" title="Roll a Driving Test" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=a Piloting Test with @{vehiclename}}}{{val1=Reaction}}{{val1_num=[[@{rea_total}]]}}{{val2=@{vehicleskillname}}}{{val2_num=[[@{vehicleskilltype}-@{rea_total}]]}}{{val3=Hot Sim/Silent/CR}}{{val3_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{val4=Noise}}{{val4_num=[[ceil(@{vehiclemode}/2)*{0,@{noise}-@{noisereduction}}kh1]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit=Speed/Handling}}{{limit_num=[[?{Limit|Handling,@{vehiclehand}|Speed,@{vehiclespeed}}]]}}{{limit_mod=[[floor(@{vehiclemode}/2)*@{controlrig}]]}}{{result=[[(@{vehicleskilltype}+[[ceil(@{vehiclemode}/2)*(@{runningsilent}+@{hotsim}-{0,@{noise}-@{noisereduction}}kh1)+floor(@{vehiclemode}/2)*@{controlrig}]]-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Limit|Handling,@{vehiclehand}|Speed,@{vehiclespeed}}+floor(@{vehiclemode}/2)*@{controlrig})]]]]}}"></button>
+                                    <button type="roll" class="vehicleroll pilotroll" name="roll_vehiclemaneuverrollpilot" title="Roll a Driving Test" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=a Piloting Test with @{vehiclename}}}{{val1=Reaction}}{{val1_num=[[@{rea_total}]]}}{{val2=@{vehicleskillname}}}{{val2_num=[[@{vehicleskilltype}-[[@{rea_total}]]]]}}{{val3=Hot Sim/Silent/CR}}{{val3_num=[[[[ceil(@{vehiclemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{vehiclemode}/2)]]*@{controlrig}]]}}{{val4=Noise}}{{val4_num=[[ceil(@{vehiclemode}/2)*{0,@{noise}-@{noisereduction}}kh1]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit=Speed/Handling}}{{limit_num=[[?{Limit|Handling,@{vehiclehand}|Speed,@{vehiclespeed}}]]}}{{limit_mod=[[floor(@{vehiclemode}/2)*@{controlrig}]]}}{{result=[[(@{vehicleskilltype}+[[ceil(@{vehiclemode}/2)*(@{runningsilent}+@{hotsim}-{0,@{noise}-@{noisereduction}}kh1)+floor(@{vehiclemode}/2)*@{controlrig}]]-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Limit|Handling,@{vehiclehand}|Speed,@{vehiclespeed}}+floor(@{vehiclemode}/2)*@{controlrig})]]]]}}"></button>
                                 </div>
                                 <div class="vehicleskillperception">
                                     <div class="vehicleskillinputwrapper">
@@ -9844,7 +9844,7 @@ Click again to switch to Manual and Remote">
                                         <input type="text" value="0" name="attr_dronemaneuversoft" title="Maneuver Autosoft Rating for this Drone">
                                     </div>
                                     <button type="roll" class="droneroll autopilotroll" name="roll_dronemaneuverrollautopilot" title="Roll a Driving Test" value="@{gmroll}&{template:shadowrun}{{name=@{dronename}}}}{{roll_name=a Piloting Test with @{dronename}}}{{val1=Pilot}}{{val1_num=[[@{dronepilot}]]}}{{val2=Maneuver-Soft}}{{val2_num=[[@{dronemaneuversoft}]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{limit=Limit}}{{limit_num=[[?{Limit|Handling,@{dronehand}|Speed,@{dronespeed}}]]}}{{result=[[(@{dronepilot}+@{dronemaneuversoft}+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Limit})]]]]}}"></button>
-                                    <button type="roll" class="droneroll pilotroll" name="roll_dronemaneuverrollpilot" title="Roll a Driving Test" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=a Piloting Test with @{dronename}}}{{val1=Reaction}}{{val1_num=[[@{rea_total}]]}}{{val2=@{droneskillname}}}{{val2_num=[[@{droneskilltype}-@{rea_total}]]}}{{val3=Hot Sim/Silent/CR}}{{val3_num=[[[[ceil(@{dronemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{dronemode}/2)]]*@{controlrig}]]}}{{val4=Noise}}{{val4_num=[[ceil(@{dronemode}/2)*{0,@{noise}-@{noisereduction}}kh1]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit=Speed/Handling}}{{limit_num=[[?{Limit|Handling,@{dronehand}|Speed,@{dronespeed}}]]}}{{limit_mod=[[floor(@{dronemode}/2)*@{controlrig}]]}}{{result=[[(@{droneskilltype}+[[ceil(@{dronemode}/2)*(@{runningsilent}+@{hotsim}-{0,@{noise}-@{noisereduction}}kh1)+floor(@{dronemode}/2)*@{controlrig}]]-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Limit|Handling,@{dronehand}|Speed,@{dronespeed}}+floor(@{dronemode}/2)*@{controlrig})]]]]}}"></button>
+                                    <button type="roll" class="droneroll pilotroll" name="roll_dronemaneuverrollpilot" title="Roll a Driving Test" value="@{gmroll}&{template:shadowrun}{{name=@{character_name}}}{{roll_name=a Piloting Test with @{dronename}}}{{val1=Reaction}}{{val1_num=[[@{rea_total}]]}}{{val2=@{droneskillname}}}{{val2_num=[[@{droneskilltype}-[[@{rea_total}]] ]]}}{{val3=Hot Sim/Silent/CR}}{{val3_num=[[[[ceil(@{dronemode}/2)]]*(@{runningsilent}+@{hotsim})+[[floor(@{dronemode}/2)]]*@{controlrig}]]}}{{val4=Noise}}{{val4_num=[[ceil(@{dronemode}/2)*{0,@{noise}-@{noisereduction}}kh1]]}}{{edge=@{edgeroll}}}{{edge_num=[[@{edg_total}]]}}{{wounds_num=[[@{wound_total}]]}}{{sustainedspells=[[@{sustainedspells}*2]]}}{{mod_num=[[?{Situational Modifiers|0}]]}}{{limit=Speed/Handling}}{{limit_num=[[?{Limit|Handling,@{dronehand}|Speed,@{dronespeed}}]]}}{{limit_mod=[[floor(@{dronemode}/2)*@{controlrig}]]}}{{result=[[(@{droneskilltype}+[[ceil(@{dronemode}/2)*(@{runningsilent}+@{hotsim}-{0,@{noise}-@{noisereduction}}kh1)+floor(@{dronemode}/2)*@{controlrig}]]-[[@{wound_total}]]-[[@{sustainedspells}*2]]+?{Situational Modifiers}+[[@{edgn}*@{edg_total}]])@{standardroll}@{edgeroll}kh[[(?{Limit|Handling,@{dronehand}|Speed,@{dronespeed}}+floor(@{dronemode}/2)*@{controlrig})]]]]}}"></button>
                                 </div>
                                 <div class="droneskillperception">
                                     <div class="droneskillinputwrapper">