diff --git a/Starfinder (simple)/Starfinder (simple).html b/Starfinder (simple)/Starfinder (simple).html
index 7a610cd9ad..e7b8e4fe80 100644
--- a/Starfinder (simple)/Starfinder (simple).html	
+++ b/Starfinder (simple)/Starfinder (simple).html	
@@ -253,7 +253,7 @@
 						<span class="sheet-table-data-center"><input type="number" title="resolve" name="attr_resolve" value="0"></span>
 						<span class="sheet-table-data-center" style="vertical-align:middle;font-size:150%;"><b>/</b></span>
 						<span class="sheet-table-data-center"><input title="resolve|max" type="number" name="attr_resolve_max" value="@{resolve-formula}" disabled></span>
-						<span class="sheet-table-data-center"><input title="after level 1 remove the '1 +'" type="text" name="attr_resolve-formula" value="(1 + @{key-ability}) + (floor(@{level}/2))"></span>
+						<span class="sheet-table-data-center"><input title="resolve-formula'" type="text" name="attr_resolve-formula" value="((floor(1/@{level})) + (@{key-ability}) + (floor(@{level}/2)))"></span>
 					</div>
 					<div class="sheet-table-row">
 					    <span class="sheet-table-header">Temp HP</span>
@@ -274,24 +274,27 @@
 				        <span class="sheet-table-header">Total</span>
 				        <span class="sheet-table-header"></span>
 				        <span class="sheet-table-header">Armor</span>
+				        <span class="sheet-table-header">Dex</span>
 				        <span class="sheet-table-header">Misc</span>
 			        </div>
 			        <div class="sheet-table-row">
 			    	    <span class="sheet-table-row-name">EAC</span>
-				        <span class="sheet-table-data-center" style="text-align:center;"><input title="EAC" type="number" name="attr_EAC" value="(10 + @{EAC-armor} + @{DEX-mod} + @{EAC-misc})" disabled></span>
+				        <span class="sheet-table-data-center" style="text-align:center;"><input title="EAC" type="number" name="attr_EAC" value="(10 + @{EAC-armor} + @{DEX-armor} + @{EAC-misc})" disabled></span>
 				        <span class="sheet-table-data-center" style="text-align:center;">= 10 +</span>
-				        <span class="sheet-table-data-center" style="text-align:center;"><input title="armor-eacbonus" type="number" name="attr_EAC-armor" value="(@{armor-eacbonus} * @{armor-equipped})" disabled></span>
+				        <span class="sheet-table-data-center" style="text-align:center;"><input title="EAC-armor" type="number" name="attr_EAC-armor" value="(@{armor-eacbonus} * @{armor-equipped})" disabled></span>
+				        <span class="sheet-table-data-center" style="text-align:center;"><input title="DEX-armor" type="number" name="attr_DEX-armor" value="(floor((@{DEX-mod} + @{armor-max-dex}) - (abs(@{DEX-mod} - @{armor-max-dex}))) / 2)" disabled></span>
 				        <span class="sheet-table-data-center" style="text-align:center;"><input title="EAC-misc" type="number" name="attr_EAC-misc" value="0"></span>
 			        </div>
 			        <div class="sheet-table-row">
 				        <span class="sheet-table-row-name">KAC</span>
-				        <span class="sheet-table-data-center" style="text-align:center;"><input title="KAC" type="number" name="attr_KAC" value="(10 + @{KAC-armor} + @{DEX-mod} + @{KAC-misc})" disabled></span>
+				        <span class="sheet-table-data-center" style="text-align:center;"><input title="KAC" type="number" name="attr_KAC" value="(10 + @{KAC-armor} + @{DEX-armor} + @{KAC-misc})" disabled></span>
 				        <span class="sheet-table-data-center" style="text-align:center;">= 10 +</span>
 				        <span class="sheet-table-data-center" style="text-align:center;"><input title="armor-kacbonus" type="number" name="attr_KAC-armor" value="(@{armor-kacbonus} * @{armor-equipped})" disabled></span>
+				        <span class="sheet-table-data-center" style="text-align:center;"><input title="DEX-armor1" type="number" name="attr_DEX-armor1" value="@{DEX-armor}" disabled></span>
 				        <span class="sheet-table-data-center" style="text-align:center;"><input title="KAC-misc" type="number" name="attr_KAC-misc" value="0"></span>
 			        </div>
 			        <div class="sheet-table-row">
-				        <span class="sheet-table-header">AC vs. Combat Manuevers</span>
+				        <span class="sheet-table-header">Combat Manuevers</span>
 				        <span class="sheet-table-data-center" style="text-align:center;"><input title="ACM" type="number" name="attr_ACM" value="(8 + @{KAC})" disabled></span>
 				        <span class="sheet-table-data-center" style="text-align:center;">= 8 +</span>
 				        <span class="sheet-table-row-name">KAC</span>
@@ -461,7 +464,7 @@
 						<span class="sheet-table-data-center"><input title="armor-eacbonus" type="number" name="attr_armor-eacbonus" value="0"></span>
 						<span class="sheet-table-data-center"><input title="armor-kacbonus" type="number" name="attr_armor-kacbonus" value="0"></span>
 						<span class="sheet-table-data-center"><input title="armor-max-dex" type="number" name="attr_armor-max-dex" value="0"></span>
-						<span class="sheet-table-data-center"><input title="armor-acp" type="number" name="attr_acp" value="0"></span>
+						<span class="sheet-table-data-center"><input title="acp" type="number" name="attr_acp" value="0"></span>
 						<span class="sheet-table-data-center" style="width:17%">
 							<select title="armor-type" name="attr_armor-type">
 								<option value="None">None</option>