diff --git a/Starfinder (simple)/Starfinder (simple).html b/Starfinder (simple)/Starfinder (simple).html
index ef09fe4697..f0489b22f8 100644
--- a/Starfinder (simple)/Starfinder (simple).html	
+++ b/Starfinder (simple)/Starfinder (simple).html	
@@ -3090,20 +3090,20 @@
 			            <span class="sheet-table-header" style="text-align:left;">Notes</span>
 			        </div>
 			        <div class="sheet-table-row">
-			            <span class="sheet-table-data-left"><input title="upgrade-name" type="text" name="upgrade-name"></span>
-			            <span class="sheet-table-data-left"><input title="upgrade-notes" type="text" name="upgrade-notes"></span>
+			            <span class="sheet-table-data-left"><input title="upgrade-name" type="text" name="attr_upgrade-name"></span>
+			            <span class="sheet-table-data-left"><input title="upgrade-notes" type="text" name="attr_upgrade-notes"></span>
 			        </div>
 			        <div class="sheet-table-row">
-			            <span class="sheet-table-data-left"><input title="upgrade-name1" type="text" name="upgrade-name1"></span>
-			            <span class="sheet-table-data-left"><input title="upgrade-notes1" type="text" name="upgrade-notes1"></span>
+			            <span class="sheet-table-data-left"><input title="upgrade-name1" type="text" name="attr_upgrade-name1"></span>
+			            <span class="sheet-table-data-left"><input title="upgrade-notes1" type="text" name="attr_upgrade-notes1"></span>
 			        </div>
 			        <div class="sheet-table-row">
-			            <span class="sheet-table-data-left"><input title="upgrade-name2" type="text" name="upgrade-name2"></span>
-			            <span class="sheet-table-data-left"><input title="upgrade-notes2" type="text" name="upgrade-notes2"></span>
+			            <span class="sheet-table-data-left"><input title="upgrade-name2" type="text" name="attr_upgrade-name2"></span>
+			            <span class="sheet-table-data-left"><input title="upgrade-notes2" type="text" name="attr_upgrade-notes2"></span>
 			        </div>
 			        <div class="sheet-table-row">
-			            <span class="sheet-table-data-left"><input title="upgrade-name3" type="text" name="upgrade-name3"></span>
-			            <span class="sheet-table-data-left"><input title="upgrade-notes3" type="text" name="upgrade-notes3"></span>
+			            <span class="sheet-table-data-left"><input title="upgrade-name3" type="text" name="attr_upgrade-name3"></span>
+			            <span class="sheet-table-data-left"><input title="upgrade-notes3" type="text" name="attr_upgrade-notes3"></span>
 			        </div>
 			    </div>
     			<br>
@@ -4504,9 +4504,9 @@ to foil enemy targeting arrays and incoming projectiles forcing gunners onboard
 				<span class="sheet-table-data-left" style="width:15%;">
 					<input type="text" title="npc-gender" name="attr_npc-gender">
 				</span>
-				<span class="sheet-table-data-center"><input type="text" title="npc-class-0-name" name="attr_npc-class-0-name"/></span>
 				<span class="sheet-table-data-center"><input type="text" title="npc-race" name="attr_npc-race"/></span>
-				<span class="sheet-table-data-center" style="width:5%;"><input type="number" title="class-0-level" name="attr_class-0-level" value="0"/></span>
+				<span class="sheet-table-data-center"><input type="text" title="npc-class-0-name" name="attr_npc-class-0-name"/></span>
+				<span class="sheet-table-data-center" style="width:5%;"><input type="number" title="npc-class-0-level" name="attr_npc-class-0-level" value="0"/></span>
 			</div>
 		</div>
 		<div class="sheet-table">
@@ -4653,9 +4653,10 @@ to foil enemy targeting arrays and incoming projectiles forcing gunners onboard
 				<span class="sheet-table-header" >Burrow</span>
 				<span class="sheet-table-header" >Climb</span>
 				<span class="sheet-table-header" >Fly</span>
+				<span class="sheet-table-header" >Source</span>
 				<span class="sheet-table-header" >Maneuverability</span>
 				<span class="sheet-table-header" >Swim</span>
-				<span class="sheet-table-header" style="width:50%;"></span>
+				<span class="sheet-table-header" style="width:45%;"></span>
 			</div>
 			<div class="sheet-table-row">
 				<span class="sheet-table-data-center" ><b>Speed</b></span>
@@ -4663,15 +4664,21 @@ to foil enemy targeting arrays and incoming projectiles forcing gunners onboard
 				<span class="sheet-table-data-center"><input title="speed-burrow-npc" type="number" name="attr_speed-burrow-npc" value="0"></span>
 				<span class="sheet-table-data-center"><input title="speed-climb-npc" type="number" name="attr_speed-climb-npc" value="0"></span>
 				<span class="sheet-table-data-center"><input title="speed-fly-npc" type="number" name="attr_speed-fly-npc" value="0"></span>
+		        <span class="sheet-table-data-center">
+					<select title="speed-fly-source-npc" name="attr_speed-fly-source-npc">
+						<option value="1" selected>Ex</option>
+						<option value="2">Su</option>
+						<option value="3">Other</option>
+					</select>
+				</span>
 		        <span class="sheet-table-data-center">
 					<select title="speed-fly-maneuverability-npc" name="attr_speed-fly-maneuverability-npc">
-						<option value="-1">Clumsy</option>
+						<option value="-8">Clumsy</option>
 						<option value="0" selected>Average</option>
-						<option value="2">Perfect</option>
+						<option value="8">Perfect</option>
 					</select>
 				</span>
 				<span class="sheet-table-data-center"><input title="speed-swim-npc" type="number" name="attr_speed-swim-npc" value="0"></span>
-				<span class="sheet-table-data-center" style="width:60%;"></span>
 			</div>
 		</div>
 		<br>
@@ -4929,6 +4936,7 @@ to foil enemy targeting arrays and incoming projectiles forcing gunners onboard
 				<span class="sheet-table-data-left"><input title="misc-0-name" type="text" name="attr_misc-0-name" placeholder="Misc Skill"></span>
 				<span class="sheet-table-data-center">
 				    <select title="Misc-0-npc" name="attr_Misc-0-npc">
+				        <option value="0" selected>None</option>
 				        <option value="(@{STR-bonus} + @{Misc-0-npc-misc})">STR</option>
 				        <option value="(@{DEX-bonus} + @{Misc-0-npc-misc})">DEX</option>
 				        <option value="(@{CON-bonus} + @{Misc-0-npc-misc})">CON</option>
@@ -4943,6 +4951,7 @@ to foil enemy targeting arrays and incoming projectiles forcing gunners onboard
 				<span class="sheet-table-data-left"><input title="misc-1-name" type="text" name="attr_misc-1-name" placeholder="Misc Skill"></span>
 				<span class="sheet-table-data-center">
 				    <select title="Misc-1-npc" name="attr_Misc-1-npc">
+				        <option value="0" selected>None</option>
 				        <option value="(@{STR-bonus} + @{Misc-1-npc-misc})">STR</option>
 				        <option value="(@{DEX-bonus} + @{Misc-1-npc-misc})">DEX</option>
 				        <option value="(@{CON-bonus} + @{Misc-1-npc-misc})">CON</option>