diff --git a/A319-100-IAE.xml b/A319-100-IAE.xml
index e57355ae..3807075f 100644
--- a/A319-100-IAE.xml
+++ b/A319-100-IAE.xml
@@ -439,7 +439,7 @@ YAW MOI_________3950000______23089847_______24848934
 
 	<engine file="v2527_a5">
 	<location unit="IN">
-		<x> 620.00683 </x>
+		<x> 620.0683 </x>
 		<y> 226.575 </y>
 		<z> -45.567 </z>
 	</location>
@@ -662,59 +662,14 @@ YAW MOI_________3950000______23089847_______24848934
 		<output>fcs/throttle-pos-norm[1]</output>
 	</pure_gain>
 	</channel>
+
 	<channel name="Yaw">
-	<!-- Testing on Ground steering Rudder bug
-	<pure_gain name="Yaw Damper Rate">
-		<input>velocities/r-rad_sec</input>
-		<gain>2</gain>
+	<pure_gain name="fcs/rudder-cmd">
+		<input>/controls/flight/rudder-fdm</input>
+		<gain>-1</gain>
+		<output>fcs/rudder-cmd-norm</output>
 	</pure_gain>
-
-	<pure_gain name="Yaw Damper Beta">
-		<input>aero/beta-rad</input>
-		<gain>-5</gain>
-	</pure_gain>
-
-	<summer name="Yaw Trim Sum">
-		<input>fcs/rudder-cmd-norm</input>
-		<input>fcs/yaw-trim-cmd-norm</input>
-		<clipto>
-		<min>-1</min>
-		<max>1</max>
-		</clipto>
-	</summer>
-
-	<summer name="Rudder Sum">
-		<input>fcs/yaw-trim-sum</input>
-		<input>fcs/yaw-damper-rate</input>
-		<input>fcs/yaw-damper-beta</input>
-		<clipto>
-		<min>-1</min>
-		<max>1</max>
-		</clipto>
-	</summer>
-
-	<aerosurface_scale name="Rudder Control">
-		<input>fcs/rudder-sum</input>
-		<gain>0.01745</gain>
-		<range>
-		<min>-25</min>
-		<max>25</max>
-		</range>
-		<output>fcs/rudder-pos-rad</output>
-	</aerosurface_scale>
-
-	<aerosurface_scale name="Rudder position normalized">
-		<input>fcs/rudder-pos-deg</input>
-		<domain>
-		<min>-25</min>
-		<max>25</max>
-		</domain>
-		<range>
-		<min>-1</min>
-		<max>1</max>
-		</range>
-		<output>fcs/rudder-pos-norm</output>
-	</aerosurface_scale> -->
+	
    <summer name="Rudder Command Sum">
       <input>fcs/rudder-cmd-norm</input>
       <input>fcs/yaw-trim-cmd-norm</input>
@@ -960,10 +915,10 @@ YAW MOI_________3950000______23089847_______24848934
 					<table>
 						<independentVar lookup="row">aero/alpha-rad</independentVar>
 						<tableData>
-							-0.20 -0.780
-							 0.00  0.335
-							 0.23  1.090
-							 0.60  0.690
+							-0.20 -0.520
+							 0.00  0.505
+							 0.23  1.800
+							 0.60  1.000
 						</tableData>
 					</table>
 				</product>
@@ -974,8 +929,16 @@ YAW MOI_________3950000______23089847_______24848934
 				<product>
 					<property>aero/qbar-psf</property>
 					<property>metrics/Sw-sqft</property>
-					<property>fcs/flap-pos-deg</property>
-					<value> 0.00700 </value>
+					<table>
+						<independentVar lookup="row">fcs/flap-pos-norm</independentVar>
+						<tableData>
+							0.000  0.00000
+							0.290  0.00350
+							0.596  0.00700
+							0.645  0.01300
+							1.000  0.01700
+						</tableData>
+					</table>
 				</product>
 			</function>
 
@@ -985,7 +948,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>aero/qbar-psf</property>
 					<property>metrics/Sw-sqft</property>
 					<property>fcs/slat-pos-deg</property>
-					<value> 0.02500 </value>
+					<value> 0.01000 </value>
 				</product>
 			</function>
 
@@ -995,7 +958,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>aero/qbar-psf</property>
 					<property>metrics/Sw-sqft</property>
 					<property>fcs/speedbrake-pos-norm</property>
-					<value>-0.1</value>
+					<value>-0.15</value>
 				</product>
 			</function>
 
@@ -1024,8 +987,8 @@ YAW MOI_________3950000______23089847_______24848934
 							-1.57    1.300
 							-0.26    0.021
 							 0.00    0.012
-							 0.26    0.021
-							 1.57    1.300
+							 0.26    0.028
+							 1.57    1.350
 						</tableData>
 					</table>
 				</product>
@@ -1074,7 +1037,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>aero/qbar-psf</property>
 					<property>metrics/Sw-sqft</property>
 					<property>fcs/flap-pos-deg</property>
-					<value> 0.00120 </value>
+					<value> 0.00200 </value>
 				</product>
 			</function>
 
@@ -1084,7 +1047,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>aero/qbar-psf</property>
 					<property>metrics/Sw-sqft</property>
 					<property>gear/gear-pos-norm</property>
-					<value>0.020</value>
+					<value>0.030</value>
 				</product>
 			</function>
 
@@ -1094,7 +1057,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>aero/qbar-psf</property>
 					<property>metrics/Sw-sqft</property>
 					<property>fcs/speedbrake-pos-norm</property>
-					<value>0.02</value>
+					<value>0.03</value>
 				</product>
 			</function>
 
@@ -1280,7 +1243,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>metrics/bw-ft</property>
 					<property>aero/bi2vel</property>
 					<property>velocities/r-aero-rad_sec</property>
-					<value>-0.15</value>
+					<value>-0.2</value>
 				</product>
 			</function>
 
@@ -1291,7 +1254,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>metrics/Sw-sqft</property>
 					<property>metrics/bw-ft</property>
 					<property>fcs/rudder-pos-rad</property>
-					<value>-0.1</value>
+					<value>-0.2</value>
 				</product>
 			</function>
 
diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml
index 32e20eae..17ed55c9 100644
--- a/A320-200-IAE.xml
+++ b/A320-200-IAE.xml
@@ -439,7 +439,7 @@ YAW MOI_________3950000______23089847_______24848934
 
 	<engine file="v2527_a5">
 	<location unit="IN">
-		<x> 620.00683 </x>
+		<x> 620.0683 </x>
 		<y> 226.575 </y>
 		<z> -45.567 </z>
 	</location>
@@ -662,59 +662,14 @@ YAW MOI_________3950000______23089847_______24848934
 		<output>fcs/throttle-pos-norm[1]</output>
 	</pure_gain>
 	</channel>
+	
 	<channel name="Yaw">
-	<!-- Testing on Ground steering Rudder bug
-	<pure_gain name="Yaw Damper Rate">
-		<input>velocities/r-rad_sec</input>
-		<gain>2</gain>
+	<pure_gain name="fcs/rudder-cmd">
+		<input>/controls/flight/rudder-fdm</input>
+		<gain>-1</gain>
+		<output>fcs/rudder-cmd-norm</output>
 	</pure_gain>
-
-	<pure_gain name="Yaw Damper Beta">
-		<input>aero/beta-rad</input>
-		<gain>-5</gain>
-	</pure_gain>
-
-	<summer name="Yaw Trim Sum">
-		<input>fcs/rudder-cmd-norm</input>
-		<input>fcs/yaw-trim-cmd-norm</input>
-		<clipto>
-		<min>-1</min>
-		<max>1</max>
-		</clipto>
-	</summer>
-
-	<summer name="Rudder Sum">
-		<input>fcs/yaw-trim-sum</input>
-		<input>fcs/yaw-damper-rate</input>
-		<input>fcs/yaw-damper-beta</input>
-		<clipto>
-		<min>-1</min>
-		<max>1</max>
-		</clipto>
-	</summer>
-
-	<aerosurface_scale name="Rudder Control">
-		<input>fcs/rudder-sum</input>
-		<gain>0.01745</gain>
-		<range>
-		<min>-25</min>
-		<max>25</max>
-		</range>
-		<output>fcs/rudder-pos-rad</output>
-	</aerosurface_scale>
-
-	<aerosurface_scale name="Rudder position normalized">
-		<input>fcs/rudder-pos-deg</input>
-		<domain>
-		<min>-25</min>
-		<max>25</max>
-		</domain>
-		<range>
-		<min>-1</min>
-		<max>1</max>
-		</range>
-		<output>fcs/rudder-pos-norm</output>
-	</aerosurface_scale> -->
+	
    <summer name="Rudder Command Sum">
       <input>fcs/rudder-cmd-norm</input>
       <input>fcs/yaw-trim-cmd-norm</input>
@@ -960,10 +915,10 @@ YAW MOI_________3950000______23089847_______24848934
 					<table>
 						<independentVar lookup="row">aero/alpha-rad</independentVar>
 						<tableData>
-							-0.20 -0.780
-							 0.00  0.335
-							 0.23  1.090
-							 0.60  0.690
+							-0.20 -0.520
+							 0.00  0.505
+							 0.23  1.800
+							 0.60  1.000
 						</tableData>
 					</table>
 				</product>
@@ -974,8 +929,16 @@ YAW MOI_________3950000______23089847_______24848934
 				<product>
 					<property>aero/qbar-psf</property>
 					<property>metrics/Sw-sqft</property>
-					<property>fcs/flap-pos-deg</property>
-					<value> 0.00700 </value>
+					<table>
+						<independentVar lookup="row">fcs/flap-pos-norm</independentVar>
+						<tableData>
+							0.000  0.00000
+							0.290  0.00350
+							0.596  0.00700
+							0.645  0.01300
+							1.000  0.01700
+						</tableData>
+					</table>
 				</product>
 			</function>
 
@@ -985,7 +948,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>aero/qbar-psf</property>
 					<property>metrics/Sw-sqft</property>
 					<property>fcs/slat-pos-deg</property>
-					<value> 0.02500 </value>
+					<value> 0.01000 </value>
 				</product>
 			</function>
 
@@ -995,7 +958,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>aero/qbar-psf</property>
 					<property>metrics/Sw-sqft</property>
 					<property>fcs/speedbrake-pos-norm</property>
-					<value>-0.1</value>
+					<value>-0.15</value>
 				</product>
 			</function>
 
@@ -1024,8 +987,8 @@ YAW MOI_________3950000______23089847_______24848934
 							-1.57    1.300
 							-0.26    0.021
 							 0.00    0.012
-							 0.26    0.021
-							 1.57    1.300
+							 0.26    0.028
+							 1.57    1.350
 						</tableData>
 					</table>
 				</product>
@@ -1074,7 +1037,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>aero/qbar-psf</property>
 					<property>metrics/Sw-sqft</property>
 					<property>fcs/flap-pos-deg</property>
-					<value> 0.00120 </value>
+					<value> 0.00200 </value>
 				</product>
 			</function>
 
@@ -1084,7 +1047,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>aero/qbar-psf</property>
 					<property>metrics/Sw-sqft</property>
 					<property>gear/gear-pos-norm</property>
-					<value>0.020</value>
+					<value>0.030</value>
 				</product>
 			</function>
 
@@ -1094,7 +1057,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>aero/qbar-psf</property>
 					<property>metrics/Sw-sqft</property>
 					<property>fcs/speedbrake-pos-norm</property>
-					<value>0.02</value>
+					<value>0.03</value>
 				</product>
 			</function>
 
@@ -1280,7 +1243,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>metrics/bw-ft</property>
 					<property>aero/bi2vel</property>
 					<property>velocities/r-aero-rad_sec</property>
-					<value>-0.15</value>
+					<value>-0.2</value>
 				</product>
 			</function>
 
@@ -1291,7 +1254,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>metrics/Sw-sqft</property>
 					<property>metrics/bw-ft</property>
 					<property>fcs/rudder-pos-rad</property>
-					<value>-0.1</value>
+					<value>-0.2</value>
 				</product>
 			</function>
 
diff --git a/A320-main.xml b/A320-main.xml
index 2cf8e9e1..917c534c 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -280,8 +280,8 @@
 	<config>
 		<altitude-dial-mode>0</altitude-dial-mode>
 		<roll>
-			<umin>-0.40</umin>
-			<umax>0.40</umax>
+			<umin>-0.55</umin>
+			<umax>0.55</umax>
 			<kp>0.05</kp>
 			<kp-vloc>0.07</kp-vloc>
 			<ti>10.0</ti>
@@ -297,8 +297,8 @@
 			<kp-cws>-0.09</kp-cws>
 		</pitch>
 		<cmd>
-			<roll-kp>-1.0</roll-kp>
-			<roll-scale>1.4</roll-scale>
+			<roll-kp>-0.9</roll-kp>
+			<roll-scale>1.6</roll-scale>
 			<vorloc>-4.0</vorloc>
 			<alt>0.025</alt>
 			<vs>0.05</vs>
@@ -309,7 +309,7 @@
 		<autoland>
 			<kp-roll>0.10</kp-roll>
 			<kp-pitch>0.05</kp-pitch>
-			<kp-rudder>-0.3</kp-rudder>
+			<kp-rudder>-0.1</kp-rudder>
 		</autoland>
 	</config>
 	<settings>
@@ -321,7 +321,7 @@
 		<retard-ft>40</retard-ft> <!-- Enable Thrust Retard -->
 		<retard-enable>0</retard-enable> <!-- AGL to Thrust Retard -->
 		<togaspd>162</togaspd> <!-- V2 + 10kts -->
-		<lat-agl-ft>100</lat-agl-ft> <!-- Set to 999999 if you do not want T/O to change automatically to HDG, or LNAV -->
+		<lat-agl-ft>30</lat-agl-ft> <!-- Set to 999999 if you do not want T/O to change automatically to HDG, or LNAV -->
 		<reduc-agl-ft>1450</reduc-agl-ft> <!-- Set to 999999 if you do not want TOGA to change automatically to FLCH -->
 	</settings>
 	<output>
diff --git a/A321-200-IAE.xml b/A321-200-IAE.xml
index a7ab08bd..b6d1a381 100644
--- a/A321-200-IAE.xml
+++ b/A321-200-IAE.xml
@@ -439,7 +439,7 @@ YAW MOI_________3950000______23089847_______24848934
 
 	<engine file="v2533_a5">
 	<location unit="IN">
-		<x> 620.00683 </x>
+		<x> 620.0683 </x>
 		<y> 226.575 </y>
 		<z> -45.567 </z>
 	</location>
@@ -662,59 +662,14 @@ YAW MOI_________3950000______23089847_______24848934
 		<output>fcs/throttle-pos-norm[1]</output>
 	</pure_gain>
 	</channel>
+
 	<channel name="Yaw">
-	<!-- Testing on Ground steering Rudder bug
-	<pure_gain name="Yaw Damper Rate">
-		<input>velocities/r-rad_sec</input>
-		<gain>2</gain>
+	<pure_gain name="fcs/rudder-cmd">
+		<input>/controls/flight/rudder-fdm</input>
+		<gain>-1</gain>
+		<output>fcs/rudder-cmd-norm</output>
 	</pure_gain>
-
-	<pure_gain name="Yaw Damper Beta">
-		<input>aero/beta-rad</input>
-		<gain>-5</gain>
-	</pure_gain>
-
-	<summer name="Yaw Trim Sum">
-		<input>fcs/rudder-cmd-norm</input>
-		<input>fcs/yaw-trim-cmd-norm</input>
-		<clipto>
-		<min>-1</min>
-		<max>1</max>
-		</clipto>
-	</summer>
-
-	<summer name="Rudder Sum">
-		<input>fcs/yaw-trim-sum</input>
-		<input>fcs/yaw-damper-rate</input>
-		<input>fcs/yaw-damper-beta</input>
-		<clipto>
-		<min>-1</min>
-		<max>1</max>
-		</clipto>
-	</summer>
-
-	<aerosurface_scale name="Rudder Control">
-		<input>fcs/rudder-sum</input>
-		<gain>0.01745</gain>
-		<range>
-		<min>-25</min>
-		<max>25</max>
-		</range>
-		<output>fcs/rudder-pos-rad</output>
-	</aerosurface_scale>
-
-	<aerosurface_scale name="Rudder position normalized">
-		<input>fcs/rudder-pos-deg</input>
-		<domain>
-		<min>-25</min>
-		<max>25</max>
-		</domain>
-		<range>
-		<min>-1</min>
-		<max>1</max>
-		</range>
-		<output>fcs/rudder-pos-norm</output>
-	</aerosurface_scale> -->
+	
    <summer name="Rudder Command Sum">
       <input>fcs/rudder-cmd-norm</input>
       <input>fcs/yaw-trim-cmd-norm</input>
@@ -960,10 +915,10 @@ YAW MOI_________3950000______23089847_______24848934
 					<table>
 						<independentVar lookup="row">aero/alpha-rad</independentVar>
 						<tableData>
-							-0.20 -0.780
-							 0.00  0.335
-							 0.23  1.090
-							 0.60  0.690
+							-0.20 -0.520
+							 0.00  0.505
+							 0.23  1.800
+							 0.60  1.000
 						</tableData>
 					</table>
 				</product>
@@ -974,8 +929,16 @@ YAW MOI_________3950000______23089847_______24848934
 				<product>
 					<property>aero/qbar-psf</property>
 					<property>metrics/Sw-sqft</property>
-					<property>fcs/flap-pos-deg</property>
-					<value> 0.00700 </value>
+					<table>
+						<independentVar lookup="row">fcs/flap-pos-norm</independentVar>
+						<tableData>
+							0.000  0.00000
+							0.290  0.00350
+							0.596  0.00700
+							0.645  0.01300
+							1.000  0.01700
+						</tableData>
+					</table>
 				</product>
 			</function>
 
@@ -985,7 +948,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>aero/qbar-psf</property>
 					<property>metrics/Sw-sqft</property>
 					<property>fcs/slat-pos-deg</property>
-					<value> 0.02500 </value>
+					<value> 0.01000 </value>
 				</product>
 			</function>
 
@@ -995,7 +958,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>aero/qbar-psf</property>
 					<property>metrics/Sw-sqft</property>
 					<property>fcs/speedbrake-pos-norm</property>
-					<value>-0.1</value>
+					<value>-0.15</value>
 				</product>
 			</function>
 
@@ -1024,8 +987,8 @@ YAW MOI_________3950000______23089847_______24848934
 							-1.57    1.300
 							-0.26    0.021
 							 0.00    0.012
-							 0.26    0.021
-							 1.57    1.300
+							 0.26    0.028
+							 1.57    1.350
 						</tableData>
 					</table>
 				</product>
@@ -1074,7 +1037,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>aero/qbar-psf</property>
 					<property>metrics/Sw-sqft</property>
 					<property>fcs/flap-pos-deg</property>
-					<value> 0.00120 </value>
+					<value> 0.00200 </value>
 				</product>
 			</function>
 
@@ -1084,7 +1047,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>aero/qbar-psf</property>
 					<property>metrics/Sw-sqft</property>
 					<property>gear/gear-pos-norm</property>
-					<value>0.020</value>
+					<value>0.030</value>
 				</product>
 			</function>
 
@@ -1094,7 +1057,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>aero/qbar-psf</property>
 					<property>metrics/Sw-sqft</property>
 					<property>fcs/speedbrake-pos-norm</property>
-					<value>0.02</value>
+					<value>0.03</value>
 				</product>
 			</function>
 
@@ -1280,7 +1243,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>metrics/bw-ft</property>
 					<property>aero/bi2vel</property>
 					<property>velocities/r-aero-rad_sec</property>
-					<value>-0.15</value>
+					<value>-0.2</value>
 				</product>
 			</function>
 
@@ -1291,7 +1254,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>metrics/Sw-sqft</property>
 					<property>metrics/bw-ft</property>
 					<property>fcs/rudder-pos-rad</property>
-					<value>-0.1</value>
+					<value>-0.2</value>
 				</product>
 			</function>
 
diff --git a/ACJ-IAE.xml b/ACJ-IAE.xml
index a857a479..e587a808 100644
--- a/ACJ-IAE.xml
+++ b/ACJ-IAE.xml
@@ -439,7 +439,7 @@ YAW MOI_________3950000______23089847_______24848934
 
 	<engine file="v2527_a5">
 	<location unit="IN">
-		<x> 620.00683 </x>
+		<x> 620.0683 </x>
 		<y> 226.575 </y>
 		<z> -45.567 </z>
 	</location>
@@ -662,59 +662,14 @@ YAW MOI_________3950000______23089847_______24848934
 		<output>fcs/throttle-pos-norm[1]</output>
 	</pure_gain>
 	</channel>
+	
 	<channel name="Yaw">
-	<!-- Testing on Ground steering Rudder bug
-	<pure_gain name="Yaw Damper Rate">
-		<input>velocities/r-rad_sec</input>
-		<gain>2</gain>
+	<pure_gain name="fcs/rudder-cmd">
+		<input>/controls/flight/rudder-fdm</input>
+		<gain>-1</gain>
+		<output>fcs/rudder-cmd-norm</output>
 	</pure_gain>
-
-	<pure_gain name="Yaw Damper Beta">
-		<input>aero/beta-rad</input>
-		<gain>-5</gain>
-	</pure_gain>
-
-	<summer name="Yaw Trim Sum">
-		<input>fcs/rudder-cmd-norm</input>
-		<input>fcs/yaw-trim-cmd-norm</input>
-		<clipto>
-		<min>-1</min>
-		<max>1</max>
-		</clipto>
-	</summer>
-
-	<summer name="Rudder Sum">
-		<input>fcs/yaw-trim-sum</input>
-		<input>fcs/yaw-damper-rate</input>
-		<input>fcs/yaw-damper-beta</input>
-		<clipto>
-		<min>-1</min>
-		<max>1</max>
-		</clipto>
-	</summer>
-
-	<aerosurface_scale name="Rudder Control">
-		<input>fcs/rudder-sum</input>
-		<gain>0.01745</gain>
-		<range>
-		<min>-25</min>
-		<max>25</max>
-		</range>
-		<output>fcs/rudder-pos-rad</output>
-	</aerosurface_scale>
-
-	<aerosurface_scale name="Rudder position normalized">
-		<input>fcs/rudder-pos-deg</input>
-		<domain>
-		<min>-25</min>
-		<max>25</max>
-		</domain>
-		<range>
-		<min>-1</min>
-		<max>1</max>
-		</range>
-		<output>fcs/rudder-pos-norm</output>
-	</aerosurface_scale> -->
+	
    <summer name="Rudder Command Sum">
       <input>fcs/rudder-cmd-norm</input>
       <input>fcs/yaw-trim-cmd-norm</input>
@@ -960,10 +915,10 @@ YAW MOI_________3950000______23089847_______24848934
 					<table>
 						<independentVar lookup="row">aero/alpha-rad</independentVar>
 						<tableData>
-							-0.20 -0.780
-							 0.00  0.335
-							 0.23  1.090
-							 0.60  0.690
+							-0.20 -0.520
+							 0.00  0.505
+							 0.23  1.800
+							 0.60  1.000
 						</tableData>
 					</table>
 				</product>
@@ -974,8 +929,16 @@ YAW MOI_________3950000______23089847_______24848934
 				<product>
 					<property>aero/qbar-psf</property>
 					<property>metrics/Sw-sqft</property>
-					<property>fcs/flap-pos-deg</property>
-					<value> 0.00700 </value>
+					<table>
+						<independentVar lookup="row">fcs/flap-pos-norm</independentVar>
+						<tableData>
+							0.000  0.00000
+							0.290  0.00350
+							0.596  0.00700
+							0.645  0.01300
+							1.000  0.01700
+						</tableData>
+					</table>
 				</product>
 			</function>
 
@@ -985,7 +948,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>aero/qbar-psf</property>
 					<property>metrics/Sw-sqft</property>
 					<property>fcs/slat-pos-deg</property>
-					<value> 0.02500 </value>
+					<value> 0.01000 </value>
 				</product>
 			</function>
 
@@ -995,7 +958,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>aero/qbar-psf</property>
 					<property>metrics/Sw-sqft</property>
 					<property>fcs/speedbrake-pos-norm</property>
-					<value>-0.1</value>
+					<value>-0.15</value>
 				</product>
 			</function>
 
@@ -1024,8 +987,8 @@ YAW MOI_________3950000______23089847_______24848934
 							-1.57    1.300
 							-0.26    0.021
 							 0.00    0.012
-							 0.26    0.021
-							 1.57    1.300
+							 0.26    0.028
+							 1.57    1.350
 						</tableData>
 					</table>
 				</product>
@@ -1074,7 +1037,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>aero/qbar-psf</property>
 					<property>metrics/Sw-sqft</property>
 					<property>fcs/flap-pos-deg</property>
-					<value> 0.00120 </value>
+					<value> 0.00200 </value>
 				</product>
 			</function>
 
@@ -1084,7 +1047,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>aero/qbar-psf</property>
 					<property>metrics/Sw-sqft</property>
 					<property>gear/gear-pos-norm</property>
-					<value>0.020</value>
+					<value>0.030</value>
 				</product>
 			</function>
 
@@ -1094,7 +1057,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>aero/qbar-psf</property>
 					<property>metrics/Sw-sqft</property>
 					<property>fcs/speedbrake-pos-norm</property>
-					<value>0.02</value>
+					<value>0.03</value>
 				</product>
 			</function>
 
@@ -1280,7 +1243,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>metrics/bw-ft</property>
 					<property>aero/bi2vel</property>
 					<property>velocities/r-aero-rad_sec</property>
-					<value>-0.15</value>
+					<value>-0.2</value>
 				</product>
 			</function>
 
@@ -1291,7 +1254,7 @@ YAW MOI_________3950000______23089847_______24848934
 					<property>metrics/Sw-sqft</property>
 					<property>metrics/bw-ft</property>
 					<property>fcs/rudder-pos-rad</property>
-					<value>-0.1</value>
+					<value>-0.2</value>
 				</product>
 			</function>
 
diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas
index d2ab4271..3adda25b 100644
--- a/AircraftConfig/acconfig.nas
+++ b/AircraftConfig/acconfig.nas
@@ -30,6 +30,8 @@ var colddark = func {
 	setprop("/controls/flight/slats", 0.000);
 	setprop("/controls/flight/flaps", 0.000);
 	setprop("/controls/flight/flap-lever", 0);
+	setprop("/controls/flight/flap-pos", 0);
+	setprop("/controls/flight/flap-txt", " ");
 	setprop("/controls/flight/speedbrake-arm", 0);
 	setprop("/controls/gear/gear-down", 1);
 	systems.elec_init();
@@ -74,6 +76,8 @@ var beforestart = func {
 	setprop("/controls/flight/slats", 0.000);
 	setprop("/controls/flight/flaps", 0.000);
 	setprop("/controls/flight/flap-lever", 0);
+	setprop("/controls/flight/flap-pos", 0);
+	setprop("/controls/flight/flap-txt", " ");
 	setprop("/controls/flight/speedbrake-arm", 0);
 	setprop("/controls/gear/gear-down", 1);
 	systems.elec_init();
@@ -142,6 +146,8 @@ var taxi = func {
 	setprop("/controls/flight/slats", 0.000);
 	setprop("/controls/flight/flaps", 0.000);
 	setprop("/controls/flight/flap-lever", 0);
+	setprop("/controls/flight/flap-pos", 0);
+	setprop("/controls/flight/flap-txt", " ");
 	setprop("/controls/flight/speedbrake-arm", 0);
 	setprop("/controls/gear/gear-down", 1);
 	systems.elec_init();
@@ -238,6 +244,7 @@ var takeoff = func {
 			setprop("/controls/flight/flaps", 0.290);
 			setprop("/controls/flight/slats", 0.666);
 			setprop("/controls/flight/flap-lever", 1);
+			setprop("/controls/flight/flap-pos", 2);
 			setprop("/controls/flight/flap-txt", "1+F");
 			setprop("/controls/flight/elevator-trim", -0.15);
 		}
diff --git a/Models/Instruments/PFD/PFD1.xml b/Models/Instruments/PFD/PFD1.xml
index ace3d0fa..f37732bd 100644
--- a/Models/Instruments/PFD/PFD1.xml
+++ b/Models/Instruments/PFD/PFD1.xml
@@ -119,10 +119,20 @@
         <object-name>fd_roll</object-name>
         <object-name>fd_pitch</object-name>
         <condition>
-            <equals>
-                <property>/it-autoflight/output/fd1</property>
-                <value>1</value>
-            </equals>
+			<and>
+				<equals>
+					<property>/it-autoflight/output/fd1</property>
+					<value>1</value>
+				</equals>
+				<less-than>
+					<property>orientation/roll-deg</property>
+					<value>45</value>
+				</less-than>
+				<greater-than>
+					<property>orientation/roll-deg</property>
+					<value>-45</value>
+				</greater-than>
+			</and>
         </condition>
     </animation>	
 	
@@ -255,22 +265,45 @@
 		<transform>
 			<subtype>textranslate</subtype>
 			<property>instrumentation/airspeed-indicator/indicated-speed-kt</property>
-    		<factor>0.002001953</factor>
+			<interpolation>
+				<entry><ind>  0</ind><dep>    0</dep></entry>
+				<entry><ind> 20</ind><dep>0.040</dep></entry>
+				<entry><ind> 40</ind><dep>0.080</dep></entry>
+				<entry><ind> 60</ind><dep>0.118</dep></entry>
+				<entry><ind> 80</ind><dep>0.158</dep></entry>
+				<entry><ind>100</ind><dep>0.198</dep></entry>
+				<entry><ind>120</ind><dep>0.236</dep></entry>
+				<entry><ind>140</ind><dep>0.276</dep></entry>
+				<entry><ind>160</ind><dep>0.316</dep></entry>
+				<entry><ind>180</ind><dep>0.356</dep></entry>
+				<entry><ind>200</ind><dep>0.395</dep></entry>
+				<entry><ind>220</ind><dep>0.435</dep></entry>
+				<entry><ind>240</ind><dep>0.474</dep></entry>
+				<entry><ind>260</ind><dep>0.514</dep></entry>
+				<entry><ind>280</ind><dep>0.554</dep></entry>
+				<entry><ind>300</ind><dep>0.593</dep></entry>
+				<entry><ind>320</ind><dep>0.633</dep></entry>
+				<entry><ind>340</ind><dep>0.672</dep></entry>
+				<entry><ind>360</ind><dep>0.712</dep></entry>
+				<entry><ind>380</ind><dep>0.751</dep></entry>
+				<entry><ind>400</ind><dep>0.791</dep></entry>
+			</interpolation>
 			<axis>
 				<x>0</x>
 				<y>1</y>
 				<z>0</z>
 			</axis>
-			</transform>
-			<transform>
-			<property>/controls/flight/flap-lever</property>
+		</transform>
+		<transform>
+			<property>/controls/flight/flap-pos</property>
 			<subtype>textranslate</subtype>
 			<interpolation>
 				<entry><ind>0</ind><dep>0</dep></entry>
-				<entry><ind>1</ind><dep>0.090625</dep></entry>
-				<entry><ind>2</ind><dep>0.1609375</dep></entry>
-				<entry><ind>3</ind><dep>0.23125</dep></entry>
-				<entry><ind>4</ind><dep>0.303984375</dep></entry>
+				<entry><ind>1</ind><dep>0.05</dep></entry>
+				<entry><ind>2</ind><dep>0.12</dep></entry>
+				<entry><ind>3</ind><dep>0.19</dep></entry>
+				<entry><ind>4</ind><dep>0.26</dep></entry>
+				<entry><ind>5</ind><dep>0.33</dep></entry>
 			</interpolation>
 			<axis>
 				<x>1</x>
diff --git a/Models/Instruments/PFD/PFD2.xml b/Models/Instruments/PFD/PFD2.xml
index 376aae61..e3697b7c 100644
--- a/Models/Instruments/PFD/PFD2.xml
+++ b/Models/Instruments/PFD/PFD2.xml
@@ -119,10 +119,20 @@
         <object-name>fd_roll</object-name>
         <object-name>fd_pitch</object-name>
         <condition>
-            <equals>
-                <property>/it-autoflight/output/fd2</property>
-                <value>1</value>
-            </equals>
+			<and>
+				<equals>
+					<property>/it-autoflight/output/fd2</property>
+					<value>1</value>
+				</equals>
+				<less-than>
+					<property>orientation/roll-deg</property>
+					<value>45</value>
+				</less-than>
+				<greater-than>
+					<property>orientation/roll-deg</property>
+					<value>-45</value>
+				</greater-than>
+			</and>
         </condition>
     </animation>	
 	
@@ -255,22 +265,45 @@
 		<transform>
 			<subtype>textranslate</subtype>
 			<property>instrumentation/airspeed-indicator/indicated-speed-kt</property>
-    		<factor>0.002001953</factor>
+			<interpolation>
+				<entry><ind>  0</ind><dep>    0</dep></entry>
+				<entry><ind> 20</ind><dep>0.040</dep></entry>
+				<entry><ind> 40</ind><dep>0.080</dep></entry>
+				<entry><ind> 60</ind><dep>0.118</dep></entry>
+				<entry><ind> 80</ind><dep>0.158</dep></entry>
+				<entry><ind>100</ind><dep>0.198</dep></entry>
+				<entry><ind>120</ind><dep>0.236</dep></entry>
+				<entry><ind>140</ind><dep>0.276</dep></entry>
+				<entry><ind>160</ind><dep>0.316</dep></entry>
+				<entry><ind>180</ind><dep>0.356</dep></entry>
+				<entry><ind>200</ind><dep>0.395</dep></entry>
+				<entry><ind>220</ind><dep>0.435</dep></entry>
+				<entry><ind>240</ind><dep>0.474</dep></entry>
+				<entry><ind>260</ind><dep>0.514</dep></entry>
+				<entry><ind>280</ind><dep>0.554</dep></entry>
+				<entry><ind>300</ind><dep>0.593</dep></entry>
+				<entry><ind>320</ind><dep>0.633</dep></entry>
+				<entry><ind>340</ind><dep>0.672</dep></entry>
+				<entry><ind>360</ind><dep>0.712</dep></entry>
+				<entry><ind>380</ind><dep>0.751</dep></entry>
+				<entry><ind>400</ind><dep>0.791</dep></entry>
+			</interpolation>
 			<axis>
 				<x>0</x>
 				<y>1</y>
 				<z>0</z>
 			</axis>
-			</transform>
-			<transform>
-			<property>/controls/flight/flap-lever</property>
+		</transform>
+		<transform>
+			<property>/controls/flight/flap-pos</property>
 			<subtype>textranslate</subtype>
 			<interpolation>
 				<entry><ind>0</ind><dep>0</dep></entry>
-				<entry><ind>1</ind><dep>0.090625</dep></entry>
-				<entry><ind>2</ind><dep>0.1609375</dep></entry>
-				<entry><ind>3</ind><dep>0.23125</dep></entry>
-				<entry><ind>4</ind><dep>0.303984375</dep></entry>
+				<entry><ind>1</ind><dep>0.05</dep></entry>
+				<entry><ind>2</ind><dep>0.12</dep></entry>
+				<entry><ind>3</ind><dep>0.19</dep></entry>
+				<entry><ind>4</ind><dep>0.26</dep></entry>
+				<entry><ind>5</ind><dep>0.33</dep></entry>
 			</interpolation>
 			<axis>
 				<x>1</x>
diff --git a/Models/Instruments/PFD/res/spd-tape.png b/Models/Instruments/PFD/res/spd-tape.png
index 1bcbbc74..d53be643 100644
Binary files a/Models/Instruments/PFD/res/spd-tape.png and b/Models/Instruments/PFD/res/spd-tape.png differ
diff --git a/Nasal/fctl.nas b/Nasal/fctl.nas
index 3a9d702c..bf6f3ba4 100644
--- a/Nasal/fctl.nas
+++ b/Nasal/fctl.nas
@@ -2,6 +2,7 @@
 # In air, flaps 1 is slats only. On ground, it is slats and flaps.
 
 setprop("/controls/flight/flap-lever", 0);
+setprop("/controls/flight/flap-pos", 0);
 setprop("/controls/flight/flap-txt", " ");
 
 controls.flapsDown = func(step) {
@@ -11,12 +12,14 @@ controls.flapsDown = func(step) {
 				setprop("/controls/flight/flaps", 0.290);
 				setprop("/controls/flight/slats", 0.666);
 				setprop("/controls/flight/flap-lever", 1);
+				setprop("/controls/flight/flap-pos", 2);
 				setprop("/controls/flight/flap-txt", "1+F");
 				return;
 			} else {
 				setprop("/controls/flight/flaps", 0.000);
 				setprop("/controls/flight/slats", 0.666);
 				setprop("/controls/flight/flap-lever", 1);
+				setprop("/controls/flight/flap-pos", 1);
 				setprop("/controls/flight/flap-txt", "1");
 				return;
 			}
@@ -24,18 +27,21 @@ controls.flapsDown = func(step) {
 			setprop("/controls/flight/flaps", 0.596);
 			setprop("/controls/flight/slats", 0.814);
 			setprop("/controls/flight/flap-lever", 2);
+			setprop("/controls/flight/flap-pos", 3);
 			setprop("/controls/flight/flap-txt", "2");
 			return;
 		} else if (getprop("/controls/flight/flap-lever") == 2) {
 			setprop("/controls/flight/flaps", 0.645);
 			setprop("/controls/flight/slats", 0.814);
 			setprop("/controls/flight/flap-lever", 3);
+			setprop("/controls/flight/flap-pos", 4);
 			setprop("/controls/flight/flap-txt", "3");
 			return;
 		} else if (getprop("/controls/flight/flap-lever") == 3) {
 			setprop("/controls/flight/flaps", 1.000);
 			setprop("/controls/flight/slats", 1.000);
 			setprop("/controls/flight/flap-lever", 4);
+			setprop("/controls/flight/flap-pos", 5);
 			setprop("/controls/flight/flap-txt", "FULL");
 			return;
 		}
@@ -44,12 +50,14 @@ controls.flapsDown = func(step) {
 			setprop("/controls/flight/flaps", 0.645);
 			setprop("/controls/flight/slats", 0.814);
 			setprop("/controls/flight/flap-lever", 3);
+			setprop("/controls/flight/flap-pos", 4);
 			setprop("/controls/flight/flap-txt", "3");
 			return;
 		} else if (getprop("/controls/flight/flap-lever") == 3) {
 			setprop("/controls/flight/flaps", 0.596);
 			setprop("/controls/flight/slats", 0.814);
 			setprop("/controls/flight/flap-lever", 2);
+			setprop("/controls/flight/flap-pos", 3);
 			setprop("/controls/flight/flap-txt", "2");
 			return;
 		} else if (getprop("/controls/flight/flap-lever") == 2) {
@@ -57,12 +65,14 @@ controls.flapsDown = func(step) {
 				setprop("/controls/flight/flaps", 0.290);
 				setprop("/controls/flight/slats", 0.666);
 				setprop("/controls/flight/flap-lever", 1);
+				setprop("/controls/flight/flap-pos", 2);
 				setprop("/controls/flight/flap-txt", "1+F");
 				return;
 			} else {
 				setprop("/controls/flight/flaps", 0.000);
 				setprop("/controls/flight/slats", 0.666);
 				setprop("/controls/flight/flap-lever", 1);
+				setprop("/controls/flight/flap-pos", 1);
 				setprop("/controls/flight/flap-txt", "1");
 				return;
 			}
@@ -70,6 +80,7 @@ controls.flapsDown = func(step) {
 			setprop("/controls/flight/flaps", 0.000);
 			setprop("/controls/flight/slats", 0.000);
 			setprop("/controls/flight/flap-lever", 0);
+			setprop("/controls/flight/flap-pos", 0);
 			setprop("/controls/flight/flap-txt", " ");
 			return;
 		}
diff --git a/Nasal/it-fbw.nas b/Nasal/it-fbw.nas
index ee80f039..4751a675 100644
--- a/Nasal/it-fbw.nas
+++ b/Nasal/it-fbw.nas
@@ -13,12 +13,13 @@ var update_loop = func {
 		if (ail > 0.4 or ail < -0.4) {
 			setprop("/it-fbw/roll-lim-max", "67");
 			setprop("/it-fbw/roll-lim-min", "-67");
-		} else {
+		} else if (ail < 0.05 and ail > -0.05) {
 			setprop("/it-fbw/roll-lim-max", "33");
 			setprop("/it-fbw/roll-lim-min", "-33");
-			if (getprop("/it-fbw/law") > 33) {
+		} else {
+			if (getprop("/it-fbw/roll-deg") > 33) {
 				setprop("/it-fbw/roll-deg", "33");
-			} else if (getprop("/it-fbw/law") < -33) {
+			} else if (getprop("/it-fbw/roll-deg") < -33) {
 				setprop("/it-fbw/roll-deg", "-33");
 			}
 		}