diff --git a/Aircraft-yasim/747.xml b/Aircraft-yasim/747.xml
index 3be382564..cd33cec48 100644
--- a/Aircraft-yasim/747.xml
+++ b/Aircraft-yasim/747.xml
@@ -25,8 +25,8 @@
 <wing x="-26.50" y="3.01" z="-1.45" length="33.72" chord="13.25" sweep="33"
       taper=".27" dihedral="7" camber="0.15" incidence="-0.7">
   <stall aoa="15" width="2" peak="1.5"/>
-  <flap0 start="0" end=".56" lift="1.8" drag="3"/>
-  <flap1 start=".64" end=".88" lift="1.3" drag="1.5"/>
+  <flap0 start="0" end=".56" lift="1.8" drag="1.2"/>
+  <flap1 start=".64" end=".88" lift="1.3" drag="1.2"/>
   <slat start="0" end="1" aoa="2" drag="1.1"/>
   <spoiler start="0.2" end="0.6" lift="0.3" drag="2.0"/>
   <control-input axis="/controls/flaps" control="FLAP0"/>
@@ -45,7 +45,7 @@
 <hstab x="-62.63" y="1.81" z="1.81" chord="8.43" length="10.84" taper=".29"
        sweep="28" dihedral="7" camber="-0.1" effectiveness="1.5">
   <stall aoa="15" width="2" peak="1.5"/>
-  <flap0 start="0" end="1" lift="1.6" drag="1.8"/>
+  <flap0 start="0" end="1" lift="1.6" drag="1.2"/>
   <control-input axis="/controls/elevator" control="FLAP0"/>
   <control-input axis="/controls/elevator-trim" control="FLAP0"/>
   <control-output control="FLAP0" prop="/surface-positions/elevator-pos-norm"/>
diff --git a/Aircraft-yasim/a4.xml b/Aircraft-yasim/a4.xml
index 507376bfd..ad84b06a3 100644
--- a/Aircraft-yasim/a4.xml
+++ b/Aircraft-yasim/a4.xml
@@ -1,4 +1,4 @@
-<airplane mass="10250">
+<airplane mass="9853">
 
 <!-- Approach configuration -->
 <approach speed="130" aoa="13.5">
@@ -7,9 +7,9 @@
   <control-setting axis="/controls/gear-down" value="1"/>
 </approach>
 
-<!-- Cruise configuration -->
-<cruise speed="517" alt="34000">
-  <control-setting axis="/controls/throttle[0]" value="1.0"/>
+<!-- Cruise configuration.  This number is for an A-4F (595mph/FL340) -->
+<cruise speed="585" alt="34000">
+  <control-setting axis="/controls/throttle[0]" value="0.8"/>
   <control-setting axis="/controls/flaps" value="0.0"/>
   <control-setting axis="/controls/gear-down" value="0"/>
 </cruise>
@@ -20,9 +20,9 @@
           width="2.0" taper="0.5" midpoint="0.3"/>
 
 <wing x="-6.4" y=".55" z="0" taper=".186"
-      length="4.04" chord="3.95" sweep="28" dihedral="0" camber="0.1">
+      length="4.04" chord="3.95" sweep="28" dihedral="0" camber="0.02">
   <stall aoa="27" width="10" peak="1.3"/>
-  <flap0 start="0.0" end="0.5" lift="1.5" drag="2.0"/>
+  <flap0 start="0.0" end="0.5" lift="1.4" drag="1.2"/>
   <flap1 start="0.5" end="1.0" lift="1.25" drag="1.3"/>
   <control-input axis="/controls/flaps" control="FLAP0"/>
   <control-input axis="/controls/aileron" control="FLAP1" split="true"/> 
@@ -37,7 +37,7 @@
 <hstab x="-11.01" y="0" z="1.38" taper=".3" effectiveness="1.99"
        length="2.02" chord="2.02" sweep="26">
   <stall aoa="27" width="10" peak="1.5"/>
-  <flap0 start="0" end="1" lift="1.7" drag="2.0"/>
+  <flap0 start="0" end="1" lift="1.7" drag="1.2"/>
   <control-input axis="/controls/elevator" control="FLAP0"/>
   <control-input axis="/controls/elevator-trim" control="FLAP0"/>
   <control-output control="FLAP0" prop="/surface-positions/elevator-pos-norm"/>
@@ -46,22 +46,21 @@
 <vstab x="-11.01" y="0" z="1.38" taper=".176"
        length="2.57" chord="3.11" sweep="28" effectiveness="1.5">
   <stall aoa="27" width="10" peak="1.5"/>
-  <flap0 start="0" end="1" lift="1.15" drag="1.3"/>
+  <flap0 start="0" end="1" lift="1.15" drag="1.2"/>
   <control-input axis="/controls/rudder" control="FLAP0" invert="true"/>
   <control-output control="FLAP0" prop="/surface-positions/rudder-pos-norm"
 		  min="1" max="-1"/>
 </vstab>
 
-<!-- NOTE: Skyhawks do NOT have afterburners.  This one does for
-     testing purposes only -->
-<jet x="-5.0" y="0" z=".44" mass="2050" thrust="10250" afterburner="16500">
+<!-- P&W J52-P-6A turbojet, 8500 lbs sea level thrust -->
+<jet x="-5.0" y="0" z=".44" mass="1800" thrust="8500">
   <control-input axis="/controls/throttle[0]" control="THROTTLE"/>
-  <control-input axis="/controls/afterburner[0]" control="REHEAT"/>
 </jet>
 
 <!-- nose -->
 <gear x="-2.29" y="0" z="-1.93" retract-time="7" compression=".96">
-  <control-input axis="/controls/rudder" control="STEER" square="true"/>
+  <control-input axis="/controls/rudder" control="STEER" square="true"
+                 src0="-1" src1="1" dst0="-0.9" dst1="0.9"/>
   <control-input axis="/controls/gear-down" control="EXTEND"/>
   <control-output control="EXTEND" prop="/gear/gear[0]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
@@ -87,12 +86,14 @@
      one in each wing and one behind the cockpit. TA-4F had "only" 100
      gallons in the fuselage due to the second seat, so the wings must
      have 0-350 gallons each.  Call the tanks 260/280/260 gallons, and
-     use 6.72 lbs/gal for Jet-A fuel. -->
-<tank x="-5.50" y="0" z="0.5" jet="true" capacity="1880"/>
+     use 6.72 lbs/gal for Jet-A fuel. BUT: this is an A-4E, which had
+     770 gallons.  Figure that the extra 30 all went into the expanded
+     center tank. -->
+<tank x="-5.50" y="0" z="0.5" jet="true" capacity="1678"/>
 <tank x="-6.0" y="1" z="0" jet="true" capacity="1750"/>
 <tank x="-6.0" y="-1" z="0" jet="true" capacity="1750"/>
 
-<ballast x="-1.5" y="0" z="1" mass="650"/> <!-- cockpit -->
-<ballast x="-3.0" y="0" z="1" mass="650"/> <!-- cockpit -->
+<ballast x="-1.5" y="0" z="1" mass="450"/> <!-- cockpit -->
+<ballast x="-3.0" y="0" z="1" mass="450"/> <!-- cockpit -->
 
 </airplane>
\ No newline at end of file
diff --git a/Aircraft-yasim/c172.xml b/Aircraft-yasim/c172.xml
index 23c4709eb..2fef32b36 100644
--- a/Aircraft-yasim/c172.xml
+++ b/Aircraft-yasim/c172.xml
@@ -22,8 +22,8 @@
 <wing x="-2.47" y=".51" z=".68" taper=".78"
       length="5.37" chord="1.54" sweep="0" dihedral="1" camber="0.1">
   <stall aoa="16" width="6" peak="1.5"/>
-  <flap0 start="0" end=".38" lift="1.6" drag="2.0"/>
-  <flap1 start=".78" end="1" lift="1.5" drag="1.6"/>
+  <flap0 start="0" end=".38" lift="1.5" drag="1.2"/>
+  <flap1 start=".78" end="1" lift="1.5" drag="1.2"/>
   <control-input axis="/controls/flaps" control="FLAP0"/>
   <control-input axis="/controls/aileron" control="FLAP1" split="true"/>
   <control-input axis="/controls/aileron-trim" control="FLAP1" split="true"/>
@@ -38,7 +38,7 @@
 <hstab x="-7.16" y="0.08" z=".17" taper=".63"
        length="1.71" chord="1.36" sweep="0">
   <stall aoa="16" width="4" peak="1.5"/>
-  <flap0 start="0" end="1" lift="1.7" drag="2.0"/>
+  <flap0 start="0" end="1" lift="1.7" drag="1.2"/>
   <control-input axis="/controls/elevator" control="FLAP0"/>
   <control-input axis="/controls/elevator-trim" control="FLAP0"/>
   <control-output control="FLAP0" prop="/surface-positions/elevator-pos-norm"/>
@@ -47,7 +47,7 @@
 <vstab x="-7.16" y="0" z=".17" taper=".5"
        length="1.71" chord="1.54" sweep="20">
   <stall aoa="16" width="4" peak="1.5"/>
-  <flap0 start="0" end="1" lift="1.3" drag="1.5"/>
+  <flap0 start="0" end="1" lift="1.3" drag="1.2"/>
   <control-input axis="/controls/rudder" control="FLAP0" invert="true"/>
   <control-input axis="/controls/rudder-trim" control="FLAP0" invert="true"/>
   <control-output control="FLAP0" prop="/surface-positions/rudder-pos-norm"
diff --git a/Aircraft-yasim/c310.xml b/Aircraft-yasim/c310.xml
index fc9c475b9..e5073059b 100644
--- a/Aircraft-yasim/c310.xml
+++ b/Aircraft-yasim/c310.xml
@@ -29,8 +29,8 @@
 <wing x="-3.65" y="0.62" z="-0.18" length ="4.68" chord ="1.68"
       sweep="0" dihedral="5" taper="0.8" camber="0.1">
   <stall aoa="16" width="4" peak="1.5"/>
-  <flap0 start="0" end=".5" lift="1.5" drag="2.0"/>
-  <flap1 start=".55" end=".94" lift="1.3" drag="1.5"/>
+  <flap0 start="0" end=".5" lift="1.5" drag="1.2"/>
+  <flap1 start=".55" end=".94" lift="1.3" drag="1.2"/>
   <control-input axis="/controls/flaps" control="FLAP0"/>
   <control-speed control="FLAP0" transition-time="5"/>
   <control-output control="FLAP0" prop="/surface-positions/flap-pos-norm"/>
@@ -45,7 +45,7 @@
 <hstab x="-8.33" y="0.22" z="0.07" length ="2.34" chord ="1.24"
        sweep="0" dihedral="0" taper="0.6">
   <stall aoa="16" width="4" peak="1.5"/>
-  <flap0 start="0" end="1" lift="1.68" drag="1.8"/>
+  <flap0 start="0" end="1" lift="1.68" drag="1.2"/>
   <control-input axis="/controls/elevator" control="FLAP0"/>
   <control-input axis="/controls/elevator-trim" control="FLAP0"/>
   <control-output control="FLAP0" prop="/surface-positions/elevator-pos-norm"/>
@@ -54,7 +54,7 @@
 <vstab x="-8.26" y="0.00" z="0.26" length ="2.16" chord ="1.61"
        sweep="36" taper="0.5">
   <stall aoa="16" width="4" peak="1.5"/>
-  <flap0 start="0" end="1" lift="1.3" drag="1.5"/>
+  <flap0 start="0" end="1" lift="1.3" drag="1.2"/>
   <control-input axis="/controls/rudder" control="FLAP0" invert="true"/>
   <control-input axis="/controls/rudder-trim" control="FLAP0" invert="true"/>
   <control-output control="FLAP0" prop="/surface-positions/rudder-pos-norm"/>
diff --git a/Aircraft-yasim/dc3.xml b/Aircraft-yasim/dc3.xml
index 1c5b719cd..f2c140ab0 100644
--- a/Aircraft-yasim/dc3.xml
+++ b/Aircraft-yasim/dc3.xml
@@ -31,8 +31,8 @@
 <wing x="-7.02" y="1.09" z="0.95" length="11.58" camber="0.1"
       chord="4.77" taper=".286" sweep="19" dihedral="4">
   <stall aoa="14" width="3" peak="1.5"/>
-  <flap0 start="0.04" end="0.38" lift="1.5" drag="2.0"/>
-  <flap1 start="0.38" end="0.97" lift="1.2" drag="1.5"/>
+  <flap0 start="0.04" end="0.38" lift="1.5" drag="1.2"/>
+  <flap1 start="0.38" end="0.97" lift="1.2" drag="1.2"/>
   <control-input axis="/controls/flaps" control="FLAP0"/>
   <control-input axis="/controls/aileron" control="FLAP1" split="true"/>
   <control-input axis="/controls/aileron-trim" control="FLAP1" split="true"/>
@@ -47,7 +47,7 @@
 <hstab x="-18.12" y="0.41" z="0.27" length="3"
        chord="3" taper=".545" sweep="15">
   <stall aoa="14" width="3" peak="1.5"/>
-  <flap0 start="0" end="1" lift="1.5" drag="1.5"/>
+  <flap0 start="0" end="1" lift="1.5" drag="1.2"/>
   <control-input axis="/controls/elevator" control="FLAP0"/>
   <control-input axis="/controls/elevator-trim" control="FLAP0"/>
   <control-output control="FLAP0" prop="/surface-positions/elevator-pos-norm"/>
@@ -56,7 +56,7 @@
 <vstab x="-18.12" y="0" z="0.95" length="2.72"
        chord="3.95" taper=".462" sweep="2">
   <stall aoa="14" width="3" peak="1.5"/>
-  <flap0 start="0" end="1" lift="1.5" drag="2.0"/>
+  <flap0 start="0" end="1" lift="1.5" drag="1.2"/>
   <control-input axis="/controls/rudder" control="FLAP0" invert="true"/>
   <control-input axis="/controls/rudder-trim" control="FLAP0" invert="true"/>
   <control-output control="FLAP0" prop="/surface-positions/rudder-pos-norm"/>
diff --git a/Aircraft-yasim/harrier.xml b/Aircraft-yasim/harrier.xml
index a86379a87..ad9f68356 100644
--- a/Aircraft-yasim/harrier.xml
+++ b/Aircraft-yasim/harrier.xml
@@ -27,8 +27,8 @@
 <wing x="-7.32" y="0.46" z="0.93" length="3.71" chord="3.15"
       taper=".294" sweep="28" dihedral="-11" camber="0.05">
   <stall aoa="21" width="8" peak="1.3"/>
-  <flap0 start="0.11" end="0.56" lift="1.5" drag="2.0"/>
-  <flap1 start="0.56" end="0.91" lift="1.2" drag="1.5"/>
+  <flap0 start="0.11" end="0.56" lift="1.5" drag="1.2"/>
+  <flap1 start="0.56" end="0.91" lift="1.2" drag="1.2"/>
   <control-input axis="/controls/flaps" control="FLAP0"/>
   <control-input axis="/controls/aileron" control="FLAP1" split="true"/>
   <control-input axis="/controls/aileron-trim" control="FLAP1" split="true"/>
@@ -42,7 +42,7 @@
 <hstab x="-12.23" y="0.00" z="0.93" length="2.04" chord="1.48"
        taper=".313" sweep="24.5" dihedral="-12">
   <stall aoa="20" width="7" peak="1.5"/>
-  <flap0 start="0" end="1" lift="1.7" drag="2.0"/>
+  <flap0 start="0" end="1" lift="1.7" drag="1.2"/>
   <control-input axis="/controls/elevator" control="FLAP0"/>
   <control-input axis="/controls/elevator-trim" control="FLAP0"/>
   <control-output control="FLAP0" prop="/surface-positions/elevator-pos-norm"/>
@@ -51,7 +51,7 @@
 <vstab x="-12.51" y="0.00" z="1.20" length="2.78" chord="2.41"
        taper=".308" sweep="23.5">
   <stall aoa="20" width="7" peak="1.5"/>
-  <flap0 start="0.12" end="0.88" lift="1.2" drag="1.5"/>
+  <flap0 start="0.12" end="0.88" lift="1.2" drag="1.2"/>
   <control-input axis="/controls/rudder" control="FLAP0" invert="true"/>
   <control-input axis="/controls/rudder-trim" control="FLAP0" invert="true"/>
   <control-output control="FLAP0" prop="/surface-positions/rudder-pos-norm"