diff --git a/LANCER RPG (1.8)/LANCER.css b/LANCER RPG (1.8)/LANCER.css
index 59d029171e..412245ba8b 100644
--- a/LANCER RPG (1.8)/LANCER.css	
+++ b/LANCER RPG (1.8)/LANCER.css	
@@ -333,32 +333,32 @@ input.sheet-long
 
 input.sheet-license
 {
-    width: 25px;
+	width: 25px;
     height: 30px;
-    opacity:0;
-    z-index:9999;
+	opacity:0;
+	z-index:9999;
 }
 
 input.sheet-structure, input.sheet-corestress{
-    margin-right:10px;
-    width: 55px;
+	margin-right:10px;
+	width: 55px;
     height: 40px;
-    cursor: pointer;    
-    position: relative;
-    opacity: 0;
-    z-index: 9999;
-    margin-top:0px;
+    cursor: pointer;	
+	position: relative;
+	opacity: 0;
+	z-index: 9999;
+	margin-top:0px;
 }
 
 input.sheet-overcharge
 {
-    width: 35px;
+	width: 35px;
     height: 40px;
-    cursor: pointer;    
-    position: relative;
-    opacity: 0;
-    z-index: 9999;
-    margin-top:0px;
+    cursor: pointer;	
+	position: relative;
+	opacity: 0;
+	z-index: 9999;
+	margin-top:0px;
 }
 
 input.sheet-corepower
@@ -379,42 +379,42 @@ span.sheet-haseinfo
 
 span.sheet-overcharge
 {
-    text-align: center;
+	text-align: center;
     display: inline-block;
-    font-size: 13px;    
-    background: #c7c3b0;
-    color: black;
-    font-weight: bold;
-    width: 35px;
+	font-size: 13px;	
+	background: #c7c3b0;
+	color: black;
+	font-weight: bold;
+	width: 35px;
     height: 40px;
-    cursor: pointer;    
-    position: relative;
-    vertical-align: middle;
-    left:30px;
-    margin-left:-35px;
-    border: 2px solid black;
-    border-left:none;
-    margin-top:0px;
+    cursor: pointer;	
+	position: relative;
+	vertical-align: middle;
+	left:30px;
+	margin-left:-35px;
+	border: 2px solid black;
+	border-left:none;
+	margin-top:0px;
 }
 
 
 span.sheet-structure, span.sheet-corestress{
-    text-align: center;
+	text-align: center;
     display: inline-block;
-    font-size: 13px;    
-    background: #c7c3b0;
-    color: black;
-    font-weight: bold;
-    width: 55px;
+	font-size: 13px;	
+	background: #c7c3b0;
+	color: black;
+	font-weight: bold;
+	width: 55px;
     height: 40px;
-    cursor: pointer;    
-    vertical-align: middle;
-    margin-left:-65px;
-    border: 2px solid black;
-    border-left:none;
-    position:relative;
-    left:60px;
-    margin-top:0px;
+    cursor: pointer;	
+	vertical-align: middle;
+	margin-left:-65px;
+	border: 2px solid black;
+	border-left:none;
+	position:relative;
+	left:60px;
+	margin-top:0px;
 }
 
 span.sheet-pskill-fancy
@@ -435,18 +435,18 @@ span.sheet-license
     cursor:pointer;
     display: inline-block;
     line-height:30px;
-    text-align: center;
-    font-size: 13px;    
-    font-weight: bold;
-    background: #c7c3b0;
-    color: black;
-    width: 20px;
+	text-align: center;
+	font-size: 13px;	
+	font-weight: bold;
+	background: #c7c3b0;
+	color: black;
+	width: 20px;
     height: 30px;
-    border: 2px solid black;
-    border-left:none;
-    margin-left:-25px;
-    margin-top:0px;
-    margin-bottom:0px;
+	border: 2px solid black;
+	border-left:none;
+	margin-left:-25px;
+	margin-top:0px;
+	margin-bottom:0px;
     position:relative;
     left:22px;
     
@@ -558,8 +558,8 @@ textarea
 
 /*-------------TAB SETUP-------------*/
 /*this hides the contents of each tab by default*/
-.charsheet div[class^="sheet-section"] {    
-    display: none;
+.charsheet div[class^="sheet-section"] { 	
+	display: none;
 }
 
 /*this shows the tab content when the appropriate input field is selected*/
@@ -567,63 +567,65 @@ textarea
 .charsheet input.sheet-tab2:checked ~ div.sheet-section-talents,
 .charsheet input.sheet-tab3:checked ~ div.sheet-section-frame
 {
-    display: block;
+	display: block;
 }
 
-.charsheet input.sheet-tab99:checked ~ div[class^="sheet-section"] {    
-    display: block;
+.charsheet input.sheet-tab99:checked ~ div[class^="sheet-section"] { 	
+	display: block;
 }
 
 /*this hides the radio button for each tab, makes it 100px wide and 40px tall and makes sure it's above everything else*/
 .charsheet input.sheet-tab {
     width: 100px;
     height: 50px;
-    cursor: pointer;    
-    position: relative;
-    opacity: 0;
-    z-index: 9999;
+    cursor: pointer;	
+	position: relative;
+	opacity: 0;
+	z-index: 9999;
 }
 
 .charsheet input.sheet-acc-tab {
+    left:15px;
     width: 100px;
     height: 50px;
-    cursor: pointer;    
-    position: relative;
-    opacity: 0;
-    z-index: 9999;
+    cursor: pointer;	
+	position: relative;
+	opacity:0;
+	z-index: 9999;
 }
 
 /*this styles the span with the tab information and slides to the left, so it appears underneath the radio button*/
 .charsheet span.sheet-tab {
-    text-align: center;
+	text-align: center;
     display: inline-block;
-    font-size: 13px;    
-    background: #c7c3b0;
-    color: black;
-    font-weight: bold;
-    border-radius: 4px;
-    width: 100px;
+	font-size: 13px;	
+	background: #c7c3b0;
+	color: black;
+	font-weight: bold;
+	border-radius: 4px;
+	width: 100px;
     height: 40px;
-    cursor: pointer;    
-    position: relative;
-    vertical-align: middle;
-    margin-left: -101px;/*originally 91px*/
+    cursor: pointer;	
+	position: relative;
+	vertical-align: middle;
+	margin-left: -101px;/*originally 91px*/
 }
 
 .charsheet span.sheet-acc-tab {
-    text-align: center;
+    left:15px;
+	text-align: center;
     display: inline-block;
-    font-size: 13px;    
-    background: #c7c3b0;
-    color: black;
-    font-weight: bold;
-    border-radius: 4px;
-    width: 100px;
+	font-size: 13px;	
+	background: #c7c3b0;
+	color: black;
+	font-weight: bold;
+	border-radius: 4px;
+	width: 100px;
     height: 40px;
-    cursor: pointer;    
-    position: relative;
-    vertical-align: middle;
-    margin-left: -101px;/*originally 91px*/
+    cursor: pointer;	
+	position: relative;
+	vertical-align: middle;
+	margin-left: -101px;/*originally 91px*/
 }
 
 /*license button color setup*/
@@ -651,7 +653,7 @@ input.sheet-license1:checked+span.sheet-license1
 {
     background: #2c424e;
     color: #bfc4c6;
-    border-radius: 4px;
+	border-radius: 4px;
 }
 
 /*acc button color setup*/
@@ -660,7 +662,7 @@ input.sheet-acc-tab2:checked + span.sheet-acc-tab2,
 input.sheet-acc-tab3:checked + span.sheet-acc-tab3
 {
     background: #ff9d87;
-    border-radius: 4px;
+	border-radius: 4px;
 }
 
 /*core stress/structure/overcharge color setup*/
diff --git a/LANCER RPG (1.8)/LANCER.html b/LANCER RPG (1.8)/LANCER.html
index ea98614391..8f5f37fc21 100644
--- a/LANCER RPG (1.8)/LANCER.html	
+++ b/LANCER RPG (1.8)/LANCER.html	
@@ -1,165 +1,164 @@
 <script type="text/worker">
-    on("sheet:opened change:frame_save_target change:frame_class change:frame_tech_attack change:frame_sp change:acc_diff_mod change:frame_sp change:core_hull change:core_agility change:core_systems change:core_engineering change:licenselevel change:frame_evasion change:frame_sensors change:frame_edef change:frame_evasion change:frame_armor change:frame_speed change:frame_hp_bonus change:frame_heat_bonus change:frame_repairs_bonus change:acc_tab", function() {
-    getAttrs(["net_acc","frame_save_target", "core_hull", "core_agility","core_systems","core_engineering","licenselevel", "frame_tech_attack","frame_evasion","frame_edef","frame_speed", "frame_armor","frame_sensors","frame_hp_bonus","frame_heat_bonus","frame_repairs_bonus", "frame_sp", "frame_class","acc_diff_mod","acc_tab","net_pilot_acc","grit"], function(values) {
-        let accval=parseInt(values.acc_diff_mod);
-        let net_acc = 0;
+    on("sheet:opened change:acc_diff change:frame_class change:frame_tech_attack change:frame_sp change:acc_diff_mod change:frame_sp change:core_hull change:core_agility change:core_systems change:core_engineering change:licenselevel change:frame_evasion change:frame_sensors change:frame_edef change:frame_evasion change:frame_armor change:frame_speed change:frame_hp_bonus change:frame_heat_bonus change:frame_repairs_bonus change:acc_tab", function() {
+    getAttrs(["acc_dif","core_hull", "core_agility","core_systems","core_engineering","licenselevel", "frame_tech_attack","frame_evasion","frame_edef","frame_speed", "frame_armor","frame_sensors","frame_hp_bonus","frame_heat_bonus","frame_repairs_bonus", "frame_sp", "frame_class","acc_diff","acc_tab","grit"], function(values) {
+        let net_acc=parseInt(values.acc_diff,10);
         let frame_hp = 0;
         let frame_heat = 0;
         let frame_repairs = 0;
-        let tech_attack = 0;
-        let net_pilot_acc = 0;
-        
+        let save_target = 0;
+        let accdiff_input = net_acc;
+
         switch (values.frame_class)
         {
             case "EVEREST":
                 frame_hp = 10;
                 frame_heat = 6;
                 frame_repairs = 5;
-                tech_attack = 0;
+                save_target = 10;
                 break;
             case "BLACKBEARD":
                 frame_hp = 12;
                 frame_heat = 4;
                 frame_repairs = 5;
-                tech_attack = -2;
+                save_target = 10;
                 break;
             case "DRAKE":
                 frame_hp = 8;
                 frame_heat = 5;
                 frame_repairs = 5;
-                tech_attack = 0;
+                save_target = 10;
                 break;
             case "LANCASTER":
                 frame_hp = 6;
                 frame_heat = 6;
                 frame_repairs = 10;
-                tech_attack = 0;
+                save_target = 10;
                 break;
             case "NELSON":
                 frame_hp = 8;
                 frame_heat = 6;
                 frame_repairs = 5;
-                tech_attack = 0;
+                save_target = 10;
                 break;
             case "RALEIGH":
                 frame_hp = 10;
                 frame_heat = 5;
                 frame_repairs = 5;
-                tech_attack = -1;
+                save_target = 10;
                 break;
             case "TORTUGA":
                 frame_hp = 8;
                 frame_heat = 6;
                 frame_repairs = 6;
-                tech_attack = 1;
+                save_target = 10;
                 break;
             case "VLAD":
                 frame_hp = 8;
                 frame_heat = 6;
                 frame_repairs = 4;
-                tech_attack = -1;
+                save_target = 10;
                 break;
             case "BLACK WITCH":
                 frame_hp = 6;
                 frame_heat = 6;
                 frame_repairs = 3;
-                tech_attack = 1;
+                save_target = 10;
                 break;
             case "DEATH'S HEAD":
                 frame_hp = 8;
                 frame_heat = 6;
                 frame_repairs = 2;
-                tech_attack = 0;
+                save_target = 10;
                 break;
             case "DUSK WING":
                 frame_hp = 6;
                 frame_heat = 4;
                 frame_repairs = 3;
-                tech_attack = 1;
+                save_target = 10;
                 break;
             case "METALMARK":
                 frame_hp = 8;
                 frame_heat = 5;
                 frame_repairs =4;
-                tech_attack = 0;
+                save_target = 10;
                 break;
             case "MONARCH":
                 frame_hp = 8;
                 frame_heat = 6;
                 frame_repairs = 3;
-                tech_attack = 1;
+                save_target = 10;
                 break;
             case "MOURNING CLOAK":
                 frame_hp = 8;
                 frame_heat = 4;
                 frame_repairs = 3;
-                tech_attack = 0;
+                save_target = 10;
                 break;
             case "SWALLOWTAIL":
                 frame_hp = 6;
                 frame_heat = 4;
                 frame_repairs = 5;
-                tech_attack = 1;
+                save_target = 10;
                 break;
             case "BALOR":
                 frame_hp = 12;
                 frame_heat = 4;
                 frame_repairs = 4;
-                tech_attack = 1;
+                save_target = 10;
                 break;
             case "GOBLIN":
                 frame_hp = 6;
                 frame_heat = 4;
                 frame_repairs = 2;
-                tech_attack = 2;
+                save_target = 12;
                 break;
             case "GORGON":
                 frame_hp = 12;
                 frame_heat = 5;
                 frame_repairs = 3;
-                tech_attack = 0;
+                save_target = 10;
                 break;
             case "HYDRA":
                 frame_hp = 8;
                 frame_heat = 5;
                 frame_repairs = 4;
-                tech_attack = 1;
+                save_target = 10;
                 break;
             case "MANTICORE":
-                frame_hp = 8;
+                frame_hp = 12;
                 frame_heat = 7;
                 frame_repairs = 3;
-                tech_attack = 1;
+                save_target = 10;
                 break;
             case "MINOTAUR":
                 frame_hp = 10;
                 frame_heat = 5;
                 frame_repairs = 4;
-                tech_attack = 2;
+                save_target = 10;
                 break;
             case "PEGASUS":
                 frame_hp = 8;
                 frame_heat = 6;
                 frame_repairs = 3;
-                tech_attack = 1;
+                save_target = 10;
                 break;
             case "BARBAROSSA":
                 frame_hp = 10;
                 frame_heat = 8;
                 frame_repairs = 4;
-                tech_attack = -2;
+                save_target = 10;
                 break;
             case "GENGHIS":
                 frame_hp = 6;
                 frame_heat = 10;
                 frame_repairs = 4;
-                tech_attack = -2;
+                save_target = 10;
                 break;
             case "ISKANDER":
                 frame_hp = 8;
                 frame_heat = 7;
                 frame_repairs = 4;
-                tech_attack = 0;
+                save_target = 10;
                 break;
             case "NAPOLEON":
                 frame_hp = 6;
@@ -171,62 +170,60 @@
                 frame_hp = 12;
                 frame_heat = 8;
                 frame_repairs = 4;
-                tech_attack = 0;
+                save_target = 10;
                 break;
             case "SHERMAN":
                 frame_hp = 10;
                 frame_heat = 8;
                 frame_repairs = 4;
-                tech_attack = 0;
+                save_target = 10;
                 break;
             case "TOKUGAWA":
                 frame_hp = 8;
                 frame_heat = 8;
                 frame_repairs = 4;
-                tech_attack = -1;
+                save_target = 10;
                 break;    
             default:
                 frame_hp=0;
                 frame_heat=0;
                 frame_repairs=0;
-                tech_attack = 0;
+                save_target = 10;
                 break;
         }
         
         if (values.acc_tab==="acc")
         {
-            net_acc += accval;
+            net_acc = "+"+net_acc.toString()+"d6kh1";
         }
         
         if (values.acc_tab==="diff")
         {
-            net_acc -= accval;
+            net_acc = "-"+net_acc.toString()+"d6kh1";
         }
         
         if(values.acc_tab==="none")
         {
-            accval=0;
-        }
-    
-        if (net_acc > -1)
-        {
-            net_acc = "+"+net_acc.toString();
+            
+            net_acc="+0d6kh1";
+            accdiff_input = 0;
+            
         }
         
         setAttrs({
             grit: Math.ceil(parseInt(values.licenselevel)/2),
             autocalc_evasion:parseInt(values.core_agility)+parseInt(values.frame_evasion),
             autocalc_edef:parseInt(values.core_systems,10) + parseInt(values.frame_edef,10),
-            autocalc_speed:Math.ceil(parseInt(values.core_agility,10) / 2 ) + parseInt(values.frame_speed,10),
-            autocalc_sensors: parseInt(values.frame_sensors,10),
-            autocalc_tech_attack: parseInt(values.core_systems,10) + tech_attack,
+            autocalc_speed:Math.floor(parseInt(values.core_agility,10) / 2 ) + parseInt(values.frame_speed,10),
+            autocalc_sensors: parseInt(values.core_systems,10) + parseInt(values.frame_sensors,10),
+            autocalc_tech_attack: parseInt(values.core_systems,10) + parseInt(values.frame_tech_attack),
             frame_hp_max: parseInt(values.core_hull)*2 + frame_hp + parseInt(values.frame_hp_bonus),
             frame_heat_max:parseInt(values.core_engineering,10) + frame_heat +parseInt(values.frame_heat_bonus,10),
-            frame_repairs_max:frame_repairs + parseInt(values.frame_repairs_bonus,10),
-            frame_max_sp: parseInt(values.frame_sp) + Math.ceil(parseInt(values.licenselevel)/2) + Math.ceil(parseInt(values.core_systems)/2),
-            autocalc_save_target:Math.ceil(parseInt(values.licenselevel)/2) + parseInt(values.frame_save_target),
-            acc_diff_mod:accval,
-            net_acc:net_acc
+            frame_repairs_max:frame_repairs + parseInt(values.frame_repairs_bonus,10)+Math.floor(parseInt(values.core_hull,10)/2),
+            frame_max_sp: parseInt(values.frame_sp) + Math.ceil(parseInt(values.licenselevel)/2) + Math.floor(parseInt(values.core_systems)/2),
+            autocalc_save_target:Math.ceil(parseInt(values.licenselevel)/2) + save_target,
+            net_acc:net_acc,
+            acc_diff:accdiff_input
         });
     });
 });
@@ -234,24 +231,22 @@
 
 <div style="background:#ddd;min-height:950px;min-width:820px;width:840px"> <!--> main container div<-->
 	<!-- tab/topbar setup -->
-    <input type="hidden" name="attr_net_pilot_acc" value="0"/>
     <input type="hidden" name="attr_net_acc" value="0"/>
-	<input type="radio" class="sheet-tab sheet-tab1" name="attr_core-tab" value="1" title="Pilot" checked="checked"/> 
+	<input type="radio" class="sheet-tab sheet-tab1" name="attr_core-tab" value="1" title="Pilot" checked="checked" /> 
 	<span class="tab tab1" style='line-height: 40px;'>PILOT</span>
 	<input type="radio" class="sheet-tab sheet-tab2" name="attr_core-tab" value="2" title="Talents" /> 
 	<span class="tab tab2" style='line-height: 40px;'>TALENTS</span>
 	<input type="radio" class="sheet-tab sheet-tab3" name="attr_core-tab" value="3" title="FRAME"   /> 
 	<span class="tab tab3" style='line-height: 40px;margin-right:115px'>FRAME</span>
 	
-	<!--acc/diff toolbar has been removed for now, will be re-added pending more robust acc calculation for pilot skills-->
-	
-	<!--><input type="radio" class="acc-tab acc-tab1" name="attr_acc_tab" value="acc" title="Accuracy" /> 
+
+	<input type="radio" class="acc-tab acc-tab1" name="attr_acc_tab" value="acc" title="Accuracy" /> 
 	<span class="acc-tab acc-tab1" style='line-height: 40px;'>ACCURACY</span>
 	<input type="radio" class="acc-tab acc-tab2" name="attr_acc_tab" value="diff" title="Difficulty" /> 
 	<span class="acc-tab acc-tab2" style='line-height: 40px;'>DIFFICULTY</span>
 	<input type="radio" class="acc-tab acc-tab2" name="attr_acc_tab" value="none" title="None" /> 
 	<span class="acc-tab acc-tab2" style='line-height: 40px;'>NONE</span>
-	<input type="number" name="attr_acc_diff_mod" min="0" value="0" style="width:45px;height:40px;display:inline;margin-left:3px;text-align:center;font-size:18px;margin-top:2px"/>	
+	<input type="number" name="attr_acc_diff" min="0" value="0" style="width:45px;height:40px;display:inline;margin-left:18px;text-align:center;font-size:18px;margin-top:2px"/>	
 	<!-- end tab setup-->
 	
     <div class="section-pilot"><!-- pilot tab -->   
@@ -306,9 +301,9 @@
                         <label style="margin-top:1px">PILOT HP</label>
                     </div>
                     <div class="flex-element">
-                        <input class="compressed 1digit" value="0" type="number" name="attr_pilot_hp"/>
+                        <input class="compressed 2digit" value="0" type="number" name="attr_pilot_hp"/>
                         <label>/</label>
-                        <input class="compressed 1digit" value="0" type="number" name="attr_pilot_hp_max" style="margin-right:25px"/>
+                        <input class="compressed 2digit" value="0" type="number" name="attr_pilot_hp_max" style="margin-right:25px"/>
                     </div>
                     <div class="flex-element">
                     </div>
@@ -343,7 +338,7 @@
                 </div><!--pilot core stats block-->
                 
                 <div class="just-between border tab-flex-item" style="height:30px"> <!--pilot grit block-->
-                    <button type="roll" class="grit-roll" name="Grit_Check" value="&{template:default}{{name=GRIT CHECK}}{{grit=[[d20cs0cf0+@{grit}]]}}">GRIT
+                    <button type="roll" class="grit-roll" name="Grit_Check" value="&{template:default}{{name=GRIT CHECK}}{{grit=[[d20cs0cf0@{net_acc}+@{grit}]]}}">GRIT
                     <span style="font-family:'dicefontd20';position:relative;top:2px">0</span></button>
                     <div class="flex-element" style="position:relative;margin:auto;right:20px">
                         <span class="frame-autocalcs" style="height:22px;padding-bottom:1px;line-height:20px;" name="attr_grit"></span>
@@ -362,7 +357,7 @@
                                 <option value="4">+4</option>
                                 <option value="6">+6</option>
                             </select>
-                            <button type="roll" name="Base_Pilot_Trigger" value="&{template:default}} {{name=@{base-pilotskill} Check}} {{@{base-pilotskill}=[[d20cs0cf0+@{base-pilotskill-mod}]] }}"></button>
+                            <button type="roll" name="Base_Pilot_Trigger" value="&{template:default}} {{name=@{base-pilotskill} Check}} {{@{base-pilotskill}=[[d20cs0cf0@{net_acc}+@{base-pilotskill-mod}]] }}"></button>
                         </div>  
                         <fieldset class="repeating_pilotskills"> <!--pilot skills repeating set--> 
                             <div class="just-between nested tab-flex-item" style="margin-left:2px;margin-bottom:0px">
@@ -372,32 +367,20 @@
                                     <option value="4">+4</option>
                                     <option value="6">+6</option>
                                 </select>
-                                <button type="roll" name="Pilot_Trigger" value="&{template:default}} {{name=@{pilotskill} Check}} {{@{pilotskill}=[[d20cs0cf0+@{pilotskill-mod}]] }}"></button>
+                                <button type="roll" name="Pilot_Trigger" value="&{template:default}} {{name=@{pilotskill} Check}} {{@{pilotskill}=[[d20cs0cf0@{net_acc}+@{pilotskill-mod}]] }}"></button>
                             </div>  
                         </fieldset> <!--pilot skills repeating set--> 
                     </div> <!--skills column wrapper-->
                 </div><!--pilot skills block-->
                 
-                <div class="border tab-flex-item" style="min-height:150px"> <!--pilot invocations block-->
+                <div class="border tab-flex-item" style="min-height:150px"> <!--pilot notes block-->
                     <div class="flex-element"> <!--block title-->
-                        <label>INVOCATIONS</label>
+                        <label>NOTES</label>
                     </div>
-                    <div class="flex-element">
-                        <label  style="width:10px">+</label>
-                        <input type="text" style="width:200px" name="attr_invocation_one">
-                    </div>
-                    <div class="flex-element">
-                        <label style="width:10px">+</label>
-                        <input type="text" style="width:200px" name="attr_invocation_two">
-                    </div>
-                    <div class="flex-element">
-                        <label style="width:10px;position:relative;left:2px">-</label>
-                        <input type="text" style="width:200px" name="attr_invocation_three">
-                    </div>
-                    <div class="flex-element">
-                        <label style="width:10px;position:relative;left:2px">-</label>
-                        <input type="text" style="width:200px" name="attr_invocation_four">
+                    <div class="flex-element" style="width:100%;height:90%"> <!--notes textarea -->
+                        <textarea name="attr_notes"></textarea>
                     </div>
+
                 </div>
             </div> <!--pilot col 1-->
             
@@ -550,7 +533,7 @@
                 <div class="just-between nopad tab-flex-item" style="width:400px;min-height:150px;height:150px;margin-top:-23px"> <!--pilot base weapons joint block -->
                     <div class="mini-input just-between nomarg border tab-flex-item" style="width:49%;height:150px"> <!--pilot base weapon block 1-->
                         <div class="flex-element"> <!--block title-->
-                            <button type="roll" name="Pilot_Wep_1" class="pilotweapon-roll" value="&{template:default}{{name=PILOT ATTACK: @{base_pilotwep1_name}}} {{ATK=[[d20cs0cf0+@{grit}]]}}{{DMG=[[@{base_pilotwep1_damage}]] @{base_pilotwep1_dmgtype}}} {{RANGE=[[@{base_pilotwep1_range}]]}}{{TAGS=@{base_pilotwep1_tags}}}">
+                            <button type="roll" name="Pilot_Wep_1" class="pilotweapon-roll" value="&{template:default}{{name=PILOT ATTACK: @{base_pilotwep1_name}}} {{ATK=[[d20cs0cf0@{net_acc}+@{grit}]]}}{{DMG=[[@{base_pilotwep1_damage}]] @{base_pilotwep1_dmgtype}}} {{RANGE=[[@{base_pilotwep1_range}]]}}{{TAGS=@{base_pilotwep1_tags}}}">
                                 PILOT WEAPON 1 <span style="font-family:'dicefontd20';position:relative;top:2px">0</span></button>
                         </div>
                         <div class="flex-element"> 
@@ -598,7 +581,7 @@
                     
                     <div class="mini-input just-between nomarg border tab-flex-item" style="width:49%;height:150px;"> <!--pilot base weapon block 2-->
                         <div class="flex-element"> <!--block title-->
-                            <button type="roll"  name="Pilot_Wep_2" class="pilotweapon-roll" value="&{template:default}{{name=PILOT ATTACK: @{base_pilotwep2_name}}} {{ATK=[[d20cs0cf0+@{grit}]]}}{{DMG=[[@{base_pilotwep2_damage}]] @{base_pilotwep2_dmgtype}}} {{RANGE=[[@{base_pilotwep2_range}]]}}{{TAGS=@{base_pilotwep2_tags}}}">
+                            <button type="roll"  name="Pilot_Wep_2" class="pilotweapon-roll" value="&{template:default}{{name=PILOT ATTACK: @{base_pilotwep2_name}}} {{ATK=[[d20cs0cf0@{net_acc}+@{grit}]]}}{{DMG=[[@{base_pilotwep2_damage}]] @{base_pilotwep2_dmgtype}}} {{RANGE=[[@{base_pilotwep2_range}]]}}{{TAGS=@{base_pilotwep2_tags}}}">
                                 PILOT WEAPON 2 <span style="font-family:'dicefontd20';position:relative;top:2px">0</span></button>
                         </div>
                         <div class="flex-element"> 
@@ -650,7 +633,7 @@
                                 <label class="pilotwep-counter"></label>
                             </div>
                             <div class="just-end-self flex-element">
-                                <button type="roll" name="Pilot_Wep" value="&{template:default}{{name=PILOT ATTACK: @{pilotwep-name}}} {{ATK=[[d20cs0cf0+@{grit}]]}}{{DMG=[[@{pilotwep-damage}]] @{pilotwep-dmgtype}}} {{RANGE=[[@{pilotwep-range}]]}}{{TAGS=@{pilotwep-tags}}}{{TAGS=@{pilotwep-tags}}}"></button>
+                                <button type="roll" name="Pilot_Wep" value="&{template:default}{{name=PILOT ATTACK: @{pilotwep-name}}} {{ATK=[[d20cs0cf0@{net_acc}+@{grit}]]}}{{DMG=[[@{pilotwep-damage}]] @{pilotwep-dmgtype}}} {{RANGE=[[@{pilotwep-range}]]}}{{TAGS=@{pilotwep-tags}}}{{TAGS=@{pilotwep-tags}}}"></button>
                             </div>
                             <div class="flex-element"> 
                                 <label class="mid">NAME</label>
@@ -966,7 +949,7 @@
                             <label>SIZE</label>
                         </div>
                         <div class="3m-sides flex-element"> 
-                            <input class="short" type="text" name="attr_frame_size">
+                            <input class="2digit" type="number" name="attr_frame_size">
                         </div>
                         <div class="flex-element"> 
                             <label>SP</label>
@@ -989,8 +972,8 @@
                         <div class="nested tab-flex-item-column">
                             <label class="nomarg">STRUCTURE DAMAGE</label>
                             <div class="flex-element-reverse" style="margin-bottom:25px"> <!--structure damage gauge-->
-                            	<input type="radio" class="structure structurecrit" name="attr_structure-tab" value="4" title="DAMAGE CRITICAL" /> 
-                            	<span class="structure structurecrit" style='line-height: 40px;border-radius: 0px 5px 5px 0px'>CRIT</span>
+                            	<input type="radio" class="structure structurecrit" name="attr_structure-tab" value="4" title="Destroyed!" /> 
+                            	<span class="structure structurecrit" style='line-height:37px; font-size:30px;border-radius: 0px 5px 5px 0px'>⚠</span>
                             	<input type="radio" class="structure structure4" name="attr_structure-tab" value="3" title="3 Damage" /> 
                             	<span class="structure structure4" style='line-height: 40px;'>3</span>
                             	<input type="radio" class="structure structure3" name="attr_structure-tab" value="2" title="2 Damage" /> 
@@ -1002,8 +985,8 @@
                             </div> <!--structure damage gauge-->
                             <label class="nomarg">REACTOR STRESS</label>
                             <div class="flex-element-reverse" style="margin-bottom:10px"> <!--core stress gauge-->
-                            	<input type="radio" class="corestress corestressbreach" name="attr_corestress-tab" value="5" title="CORE BREACH"/> 
-                            	<span class="corestress corestressbreach" style='line-height:40px; font-size:10px; border-radius:0px 5px 5px 0px'>BREACH</span>
+                            	<input type="radio" class="corestress corestressbreach" name="attr_corestress-tab" value="5" title="Meltdown!️"/> 
+                            	<span class="corestress corestressbreach" style='line-height:37px; font-size:30px; border-radius:0px 5px 5px 0px'>⚠️</span>
                             	<input type="radio" class="corestress corestress4" name="attr_corestress-tab" value="4" title="3 Reactor Stress" /> 
                             	<span class="corestress corestress4" style='line-height: 40px;'>3</span>
                             	<input type="radio" class="corestress corestress3" name="attr_corestress-tab" value="3" title="2 Reactor Stress" /> 
@@ -1141,8 +1124,8 @@
                                 </div>
 
                                 <div class="4m-top flex-element">
-                                    <label style="margin-left:0px">SAVE TARGET</label>
-                                    <input class="2digit" type="number" value="0" min="0" style="height:25px" name="attr_frame_save_target"/>
+                                    <label style="margin-left:0px">TECH ATK</label>
+                                    <input class="2digit" type="number" value="0" min="0" style="height:25px" name="attr_frame_tech_attack"/>
                                 </div>
                             </div>
                         </div> <!--frame base stats column-->
@@ -1152,27 +1135,27 @@
                 <div class="just-around border tab-flex-item" style="width:505px;height:250px"> <!--frame stat autocalcs block-->
                     <div class="just-around multi-input flex-column-wrapper" style="width:36.55%">
                         <div class="flex-element">
-                            <label class="autocalc-rolls"> <button type="roll" name="Hull_Save" class="grit-roll" value="&{template:default}{{name=HULL SAVE}}{{hull=[[d20cs0cf0+@{core_hull}]]}}">HULL
+                            <label class="autocalc-rolls"> <button type="roll" name="Hull_Save" class="grit-roll" value="&{template:default}{{name=HULL SAVE}}{{hull=[[d20cs0cf0@{net_acc}+@{core_hull}]]}}">HULL
                             <span style="font-family:'dicefontd20';position:relative;">0</span></button></label>
                             <span class="frame-autocalcs" name="attr_core_hull"></span>
                         </div>
                         <div class="flex-element">
-                            <label class="autocalc-rolls"> <button type="roll"  name="Agility_Save" class="grit-roll" value="&{template:default}{{name=AGILITY SAVE}}{{agility=[[d20cs0cf0+@{core_agility}]]}}">AGILITY
+                            <label class="autocalc-rolls"> <button type="roll"  name="Agility_Save" class="grit-roll" value="&{template:default}{{name=AGILITY SAVE}}{{agility=[[d20cs0cf0@{net_acc}+@{core_agility}]]}}">AGILITY
                             <span style="font-family:'dicefontd20';position:relative;">0</span></button></label>
                             <span class="frame-autocalcs" name="attr_core_agility"></span>
                         </div>
                         <div class="flex-element">
-                            <label class="autocalc-rolls"> <button type="roll"  name="Systems_Save" class="grit-roll" value="&{template:default}{{name=SYSTEMS SAVE}}{{systems=[[d20cs0cf0+@{core_systems}]]}}">SYSTEMS
+                            <label class="autocalc-rolls"> <button type="roll"  name="Systems_Save" class="grit-roll" value="&{template:default}{{name=SYSTEMS SAVE}}{{systems=[[d20cs0cf0@{net_acc}+@{core_systems}]]}}">SYSTEMS
                             <span style="font-family:'dicefontd20';position:relative;">0</span></button></label>
                             <span class="frame-autocalcs" name="attr_core_systems"></span>
                         </div>
                         <div class="flex-element">
-                            <label class="autocalc-rolls" > <button type="roll"  name="Engineering_Save" class="grit-roll" value="&{template:default}{{name=ENGINEERING SAVE}}{{engineering=[[d20cs0cf0+@{core_engineering}]]}}">ENGINEERING
+                            <label class="autocalc-rolls" > <button type="roll"  name="Engineering_Save" class="grit-roll" value="&{template:default}{{name=ENGINEERING SAVE}}{{engineering=[[d20cs0cf0@{net_acc}+@{core_engineering}]]}}">ENGINEERING
                             <span style="font-family:'dicefontd20';position:relative;">0</span></button></label>
                             <span class="frame-autocalcs" name="attr_core_engineering"></span>
                         </div>
                         <div class="flex-element">
-                            <label class="autocalc-rolls"> <button type="roll"  name="Tech_Attack" class="grit-roll" value="&{template:default}{{name=TECH ATTACK}}{{attack=[[d20cs0cf0+@{autocalc_tech_attack}]]}}">TECH ATTACK
+                            <label class="autocalc-rolls"> <button type="roll"  name="Tech_Attack" class="grit-roll" value="&{template:default}{{name=TECH ATTACK}}{{attack=[[d20cs0cf0@{net_acc}+@{autocalc_tech_attack}]]}}">TECH ATTACK
                             <span style="font-family:'dicefontd20';position:relative;">0</span></button></label>
                             <span class="frame-autocalcs" name="attr_autocalc_tech_attack"></span>
                         </div>
@@ -1227,7 +1210,7 @@
                 <div class="flex-row-wrapper" style="width:515px"> <!--frame weapons block-->
                     <div class="align-start multi-input border tab-flex-item" style="width:247px;height:165px"> <!--frame base weapon 1-->
                         <div class="flex-element">
-                            <button type="roll"  name="Mech_Wep_1" class="weapon-roll" value="&{template:default}{{name=WEAPON ATTACK: @{base_framewep1_name}}} {{ATK=[[d20cs0cf0+@{grit}]]}}{{DMG=[[@{base_framewep1_damage}]] @{base_framewep1_dmgtype} }} {{RANGE=[[@{base_framewep1_range}]]}}{{TAGS=@{base_framewep1_tags}}}{{NOTES=@{base_framewep1_notes}}}">WEAPON 1
+                            <button type="roll"  name="Mech_Wep_1" class="weapon-roll" value="&{template:default}{{name=WEAPON ATTACK: @{base_framewep1_name}}} {{ATK=[[d20cs0cf0@{net_acc}+@{grit}]]}}{{DMG=[[@{base_framewep1_damage}]] @{base_framewep1_dmgtype} }} {{RANGE=[[@{base_framewep1_range}]]}}{{TAGS=@{base_framewep1_tags}}}{{NOTES=@{base_framewep1_notes}}}">WEAPON 1
                              <span style="font-family:'dicefontd20';position:relative;">0</span></button>
                             <input type="text"  style="width:112px;" name="attr_base_framewep1_name"/>
                         </div>
@@ -1262,7 +1245,7 @@
                     
                     <div class="align-start multi-input border tab-flex-item" style="width:247px;height:165px"> <!--frame base weapon 2-->
                         <div class="flex-element">
-                            <button type="roll" class="weapon-roll" name="Mech_Wep_2"  value="&{template:default}{{name=WEAPON ATTACK: @{base_framewep2_name}}} {{ATK=[[d20cs0cf0+@{grit}]]}}{{DMG=[[@{base_framewep2_damage}]] @{base_framewep2_dmgtype} }} {{RANGE=[[@{base_framewep2_range}]]}}{{TAGS=@{base_framewep2_tags}}}{{NOTES=@{base_framewep2_notes}}}">WEAPON 2
+                            <button type="roll" class="weapon-roll" name="Mech_Wep_2"  value="&{template:default}{{name=WEAPON ATTACK: @{base_framewep2_name}}} {{ATK=[[d20cs0cf0@{net_acc}+@{grit}]]}}{{DMG=[[@{base_framewep2_damage}]] @{base_framewep2_dmgtype} }} {{RANGE=[[@{base_framewep2_range}]]}}{{TAGS=@{base_framewep2_tags}}}{{NOTES=@{base_framewep2_notes}}}">WEAPON 2
                              <span style="font-family:'dicefontd20';position:relative;">0</span></button>
                             <input type="text"  style="width:112px;" name="attr_base_framewep2_name"/>
                         </div>
@@ -1298,7 +1281,7 @@
                         <fieldset class="repeating_weapons"> <!--frame weapon repeating set-->
                             <div class="align-start multi-input border tab-flex-item" style="width:247px;height:165px"> <!--frame weapon repeating item-->
                                 <div class="flex-element">
-                                <button type="roll" class="weapon-roll" name="Mech_Wep"  value="&{template:default}{{name=WEAPON ATTACK: @{framewep-name}}} {{ATK=[[d20cs0cf0+@{grit}]]}}{{DMG=[[@{framewep-damage}]] @{framewep-dmgtype} }} {{RANGE=[[@{framewep-range}]]}}{{TAGS=@{framewep-tags}}}{{NOTES=@{framewep-notes}}}">
+                                <button type="roll" class="weapon-roll" name="Mech_Wep"  value="&{template:default}{{name=WEAPON ATTACK: @{framewep-name}}} {{ATK=[[d20cs0cf0@{net_acc}+@{grit}]]}}{{DMG=[[@{framewep-damage}]] @{framewep-dmgtype} }} {{RANGE=[[@{framewep-range}]]}}{{TAGS=@{framewep-tags}}}{{NOTES=@{framewep-notes}}}">
                                 <span style="margin-left:-5px" class="weapon-counter"></span><span style="font-family:'dicefontd20';font-size:17px;"> 0</span></button>
                                 <input type="text"  style="width:112px;" name="attr_framewep-name"/>
                                 </div>
@@ -1375,7 +1358,7 @@
                     </fieldset> <!--frame traits repeating set-->
                 </div> <!--frame traits block-->
                 
-                <div class="align-start multi-input border tab-flex-item" style="height:165px;width:315px;margin-bottom:0px"> <!--frame base systems block-->
+                <div class="align-start multi-input border tab-flex-item" style="height:340px;width:315px;margin-bottom:0px"> <!--frame base systems block-->
                     <div class="flex-element" style="width:100%">
                     <button type="roll" class="sys-roll" name="Base_Mech_Sys" value="&{template:default}{{name=SYSTEM: @{base_system_name}}}{{tags=@{base_system_tags}}}{{effect=@{base_system_effect}}}">SYSTEM 1
                     <span style="font-family:'dicefontd20';position:relative;top:2px">0</span></button>
@@ -1392,12 +1375,12 @@
                     <div class="flex-element" style="margin-bottom:0px">
                         <label style="margin-bottom:0px">EFFECT</label>
                     </div>
-                    <textarea style="height:65px;margin-top:0px" name="attr_base_system_effect"></textarea>
+                    <textarea style="height:237px;margin-top:0px" name="attr_base_system_effect"></textarea>
                 </div><!--frame base systems block-->
                 
                 <div class="system-counter-div"> <!--systems counter div-->
                     <fieldset class="repeating_systems"> <!--frame systems repeating set-->
-                        <div class="align-start multi-input border tab-flex-item" style="height:165px;width:315px;margin-top:10px;margin-bottom:10px"> <!--frame systems repeating item-->
+                        <div class="align-start multi-input border tab-flex-item" style="height:340px;width:315px;margin-top:10px;margin-bottom:10px"> <!--frame systems repeating item-->
                             <div class="flex-element" style="width:100%">
                                 <button type="roll" class="sys-roll" name="Mech_Sys" value="&{template:default}{{name=SYSTEM: @{system-name}}}{{tags=@{system-tags}}}{{effect=@{system-effect}}}">
                                 <span style="margin-left:-5px" class="system-counter"></span><span style="font-family:'dicefontd20';font-size:17px;"> 0</span></button>
@@ -1414,7 +1397,7 @@
                             <div class="flex-element" style="margin-bottom:0px">
                                 <label style="margin-bottom:0px">EFFECT</label>
                             </div>
-                            <textarea style="height:65px;margin-top:0px" name="attr_system-effect" ></textarea>
+                            <textarea style="height:237px;margin-top:0px" name="attr_system-effect" ></textarea>
                         </div><!--frame systems repeating item-->
                     </fieldset> <!--frame systems repeating set-->