diff --git a/Aircraft-yasim/747.xml b/Aircraft-yasim/747.xml
index 7a178f563..82ac7081e 100644
--- a/Aircraft-yasim/747.xml
+++ b/Aircraft-yasim/747.xml
@@ -17,12 +17,12 @@
   <control-setting axis="/controls/gear-down" value="0"/>
 </cruise>
 
-<cockpit x="-5.42" y="1.81" z="15.06"/>
+<cockpit x="19.08" y="1.81" z="15.06"/>
 
-<fuselage ax="0" ay="0" az="0" bx="-69.86" by="0.00" bz="2.41"
+<fuselage ax="24.5" ay="0" az="0" bx="-45.36" by="0.00" bz="2.41"
           width="6" taper="0.3" midpoint="0.2"/>
 
-<wing x="-26.50" y="3.01" z="-1.45" length="33.72" chord="13.25" sweep="33"
+<wing x="-2" 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="1.2"/>
@@ -42,7 +42,7 @@
   <control-speed control="FLAP0" transition-time="10"/>
 </wing>
 
-<hstab x="-62.63" y="1.81" z="1.81" chord="8.43" length="10.84" taper=".29"
+<hstab x="-38.13" 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.2"/>
@@ -51,7 +51,7 @@
   <control-output control="FLAP0" prop="/surface-positions/elevator-pos-norm"/>
 </hstab>
 
-<vstab x="-62.63" y="0.00" z="3.61" chord="12.04" length="12.04" taper="0.3"
+<vstab x="-38.13" y="0.00" z="3.61" chord="12.04" length="12.04" taper="0.3"
        sweep="33">
   <stall aoa="15" width="2" peak="1.5"/>
   <flap0 start="0" end="1" lift="1.2" drag="1.3"/>
@@ -64,24 +64,24 @@
 <!-- The CF6 engines are rated at 60000 lbs thrust, flat rated to 33 -->
 <!-- degrees C.  Corrected to YASim's standard atmosphere temperature -->
 <!-- of 288.2 kelvins, that gives 63737 lbs of nominal thrust. -->
-<jet x="-34.93" y="16.26"  z="-1.20" mass="8000" thrust="63737">
+<jet x="-10.43" y="16.26"  z="-1.20" mass="8000" thrust="63737">
   <control-input axis="/controls/throttle[0]" control="THROTTLE"/>
 </jet>
 
-<jet x="-26.50" y="12.65"  z="-2.41" mass="8000" thrust="63737">
+<jet x="-2" y="12.65"  z="-2.41" mass="8000" thrust="63737">
   <control-input axis="/controls/throttle[0]" control="THROTTLE"/>
 </jet>
 
-<jet x="-26.50" y="-12.65" z="-2.41" mass="8000" thrust="63737">
+<jet x="-2" y="-12.65" z="-2.41" mass="8000" thrust="63737">
   <control-input axis="/controls/throttle[1]" control="THROTTLE"/>
 </jet>
 
-<jet x="-34.93" y="-16.26" z="-1.20" mass="8000" thrust="63737">
+<jet x="-10.43" y="-16.26" z="-1.20" mass="8000" thrust="63737">
   <control-input axis="/controls/throttle[1]" control="THROTTLE"/>
 </jet>
  
 <!-- nose -->
-<gear x="-5.42"  y="0.00" z="-5.42"
+<gear x="19.08"  y="0.00" z="-5.42"
       compression="0.75" spring="0.7" damp="4">
   <control-input axis="/controls/rudder" control="STEER" square="true"/>
   <control-input axis="/controls/gear-down" control="EXTEND"/>
@@ -89,41 +89,41 @@
   <control-speed control="EXTEND" transition-time="7"/>
 </gear>
 
-<gear x="-29.15" y="5.42" z="-5.42" compression="2"> <!-- fwd left main -->
+<gear x="-4.65" y="5.42" z="-5.42" compression="2"> <!-- fwd left main -->
   <control-input axis="/controls/brakes[0]" control="BRAKE"/>
   <control-input axis="/controls/gear-down" control="EXTEND"/>
   <control-output control="EXTEND" prop="/gear/gear[1]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
 </gear>
 
-<gear x="-31.32" y="1.81" z="-5.42" compression="2"> <!-- rear left main -->
+<gear x="-6.82" y="1.81" z="-5.42" compression="2"> <!-- rear left main -->
   <control-input axis="/controls/brakes[0]" control="BRAKE"/>
   <control-input axis="/controls/gear-down" control="EXTEND"/>
   <control-output control="EXTEND" prop="/gear/gear[2]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
 </gear>
 
-<gear x="-31.32" y="-1.81" z="-5.42" compression="2"> <!-- rear right main -->
+<gear x="-6.82" y="-1.81" z="-5.42" compression="2"> <!-- rear right main -->
   <control-input axis="/controls/brakes[1]" control="BRAKE"/>
   <control-input axis="/controls/gear-down" control="EXTEND"/>
   <control-output control="EXTEND" prop="/gear/gear[3]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
 </gear>
 
-<gear x="-29.15" y="-5.42" z="-5.42" compression="2"> <!-- fwd right main -->
+<gear x="-4.65" y="-5.42" z="-5.42" compression="2"> <!-- fwd right main -->
   <control-input axis="/controls/brakes[1]" control="BRAKE"/>
   <control-input axis="/controls/gear-down" control="EXTEND"/>
   <control-output control="EXTEND" prop="/gear/gear[4]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
 </gear>
 
-<tank x="-26.50" y="0" z="-1.45" jet="true" capacity="128000"/>
-<tank x="-30.10" y="8" z="-1.45" jet="true" capacity="128000"/>
-<tank x="-30.10" y="-8" z="-1.45" jet="true" capacity="128000"/>
+<tank x="-2" y="0" z="-1.45" jet="true" capacity="128000"/>
+<tank x="-5.6" y="8" z="-1.45" jet="true" capacity="128000"/>
+<tank x="-5.6" y="-8" z="-1.45" jet="true" capacity="128000"/>
 
-<ballast x="-6"  y="0" z="2.4" mass="30000"/> <!-- hump -->
-<ballast x="-12" y="0" z="2.4" mass="40000"/> <!-- hump -->
-<ballast x="-18" y="0" z="2.4" mass="40000"/> <!-- hump -->
-<ballast x="-24" y="0" z="2.4" mass="30000"/> <!-- hump -->
+<ballast x="18.5"  y="0" z="2.4" mass="30000"/> <!-- hump -->
+<ballast x="12.5" y="0" z="2.4" mass="40000"/> <!-- hump -->
+<ballast x="6.5" y="0" z="2.4" mass="40000"/> <!-- hump -->
+<ballast x="0.5" y="0" z="2.4" mass="30000"/> <!-- hump -->
 
 </airplane>
diff --git a/Aircraft-yasim/a4.xml b/Aircraft-yasim/a4.xml
index ad84b06a3..fe345b68b 100644
--- a/Aircraft-yasim/a4.xml
+++ b/Aircraft-yasim/a4.xml
@@ -14,18 +14,19 @@
   <control-setting axis="/controls/gear-down" value="0"/>
 </cruise>
 
-<cockpit x="-2.9" y="0.0" z="1.0"/>
+<cockpit x="2.71" y="0.0" z="0.67"/>
 
-<fuselage ax="0" ay="0" az="0" bx="-12.2" by="0" bz=".64"
+<fuselage ax="5.61" ay="0" az="-0.66" bx="-6.59" by="0" bz=".64"
           width="2.0" taper="0.5" midpoint="0.3"/>
 
-<wing x="-6.4" y=".55" z="0" taper=".186"
+<wing x="-0.79" y=".55" z="-0.33" taper=".186"
       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.4" drag="1.2"/>
+  <flap0 start="0.0" end="0.5" lift="1.3" 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"/> 
+  <control-input axis="/controls/aileron-trim" control="FLAP1" split="true"/> 
   <control-output control="FLAP0" prop="/surface-positions/flap-pos-norm"/>
   <control-output control="FLAP1" side="left"
 		  prop="/surface-positions/left-aileron-pos-norm"/>
@@ -34,31 +35,32 @@
   <control-speed control="FLAP0" transition-time="5"/>
 </wing>
 
-<hstab x="-11.01" y="0" z="1.38" taper=".3" effectiveness="1.99"
+<hstab x="-5.4" y="0" z="1.05" 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="1.2"/>
+  <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"/>
 </hstab>
 
-<vstab x="-11.01" y="0" z="1.38" taper=".176"
+<vstab x="-5.4" y="0" z="1.05" 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.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"
 		  min="1" max="-1"/>
 </vstab>
 
 <!-- P&W J52-P-6A turbojet, 8500 lbs sea level thrust -->
-<jet x="-5.0" y="0" z=".44" mass="1800" thrust="8500">
+<jet x="0.61" y="0" z="0.11" mass="1800" thrust="8500" n1-max="106">
   <control-input axis="/controls/throttle[0]" control="THROTTLE"/>
 </jet>
 
 <!-- nose -->
-<gear x="-2.29" y="0" z="-1.93" retract-time="7" compression=".96">
+<gear x="3.32" y="0" z="-2.26" retract-time="7" compression=".96">
   <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"/>
@@ -67,19 +69,21 @@
 </gear>
 
 <!-- left main -->
-<gear x="-7" y="1.19" z="-1.56" retract-time="7" compression=".78">
+<gear x="-1.39" y="1.19" z="-1.89" retract-time="7" compression=".78">
   <control-input axis="/controls/brakes[0]" control="BRAKE"/>
   <control-input axis="/controls/gear-down" control="EXTEND"/>
   <control-output control="EXTEND" prop="/gear/gear[1]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
+  <control-speed control="BRAKE" transition-time="2"/>
 </gear>
 
 <!-- right main -->
-<gear x="-7" y="-1.19" z="-1.56" retract-time="7" compression=".78">
+<gear x="-1.39" y="-1.19" z="-1.89" retract-time="7" compression=".78">
   <control-input axis="/controls/brakes[1]" control="BRAKE"/>
   <control-input axis="/controls/gear-down" control="EXTEND"/>
   <control-output control="EXTEND" prop="/gear/gear[2]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
+  <control-speed control="BRAKE" transition-time="2"/>
 </gear>
 
 <!-- A4-M had 800 gallons of in-fuselage fuel capacity in three tanks,
@@ -87,13 +91,27 @@
      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. 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"/>
+     770 gallons.  Figure that the extra 30 all went into an expanded
+     center tank underneath the new "hump" in the fuselage. -->
+<tank x="0.11" y="0" z="0.17" jet="true" capacity="1678"/>
+<tank x="-0.39" y="1" z="-0.33" jet="true" capacity="1750"/>
+<tank x="-0.39" y="-1" z="-0.33" jet="true" capacity="1750"/>
 
-<ballast x="-1.5" y="0" z="1" mass="450"/> <!-- cockpit -->
-<ballast x="-3.0" y="0" z="1" mass="450"/> <!-- cockpit -->
+<ballast x="4.11" y="0" z="0.67" mass="450"/> <!-- cockpit -->
+<ballast x="2.61" y="0" z="0.67" mass="450"/> <!-- cockpit -->
+
+<!-- The early A-4's had five pylons.  One 3500lbs center for a tank,
+     two inboard pylons holding 2250lbs, and two 1000lbs outboard
+     pylons. -->
+<weight x="-0.39" y="0" z="-1.33" size="1.5" 
+        mass-prop="/yasim/a4/weights/center-lbs"/>
+<weight x="-0.79" y="2" z="-1.33" size="1" 
+        mass-prop="/yasim/a4/weights/left-inboard-lbs"/>
+<weight x="-0.79" y="-2" z="-1.33" size="1" 
+        mass-prop="/yasim/a4/weights/right-inboard-lbs"/>
+<weight x="-1.39" y="3" z="-1.33" size="1" 
+        mass-prop="/yasim/a4/weights/left-outboard-lbs"/>
+<weight x="-1.39" y="-3" z="-1.33" size="1" 
+        mass-prop="/yasim/a4/weights/right-outboard-lbs"/>
 
 </airplane>
\ No newline at end of file
diff --git a/Aircraft-yasim/harrier.xml b/Aircraft-yasim/harrier.xml
index ad9f68356..76dff11bf 100644
--- a/Aircraft-yasim/harrier.xml
+++ b/Aircraft-yasim/harrier.xml
@@ -5,7 +5,7 @@
 <airplane mass="14052">
 
 <!-- Approach configuration -->
-<approach speed="160" aoa="11">
+<approach speed="160" aoa="8">
   <control-setting axis="/controls/throttle[0]" value="0.2"/>
   <control-setting axis="/controls/flaps" value="1.0"/>
   <control-setting axis="/controls/gear-down" value="1"/>
@@ -58,8 +58,8 @@
 		  min="1" max="-1"/>
 </vstab>
 
-<jet x="-6.12" y="0" z="0.56" mass="3000" thrust="21500" rotate="-90">
-  <actionpt x="-7.5" y="0" z="0.7"/>
+<jet x="-6.12" y="0" z="0.56" mass="3000" thrust="21500" rotate="-99">
+  <actionpt x="-7.452" y="0" z="0.671"/>
   <control-input axis="/controls/throttle[0]" control="THROTTLE"/>
   <control-input axis="/controls/mixture[0]" control="VECTOR"
                  src0="0" src1="1" dst0="1" dst1="0"/>
@@ -73,41 +73,57 @@
      anyone can find better info. -->
 
 <!-- tail jets: left yaw, right yaw and pitch down -->
-<thruster x="-15" y="0" z="1" vx="0" vy="1" vz="0" thrust="300">
+<thruster x="-15" y="0" z="1" vx="0" vy="1" vz="0" thrust="200">
   <control-input axis="/controls/rudder" control="THROTTLE"
            src0="0" src1="1" dst0="0" dst1="1"/>
+  <control-input axis="/orientation/yaw-rate-degps" control="THROTTLE"
+           src0="-5" src1="0" dst0="0.3" dst1="0"/>
 </thruster>
-<thruster x="-15" y="0" z="1" vx="0" vy="-1" vz="0" thrust="300">
+<thruster x="-15" y="0" z="1" vx="0" vy="-1" vz="0" thrust="200">
   <control-input axis="/controls/rudder" control="THROTTLE"
            src0="-1" src1="0" dst0="1" dst1="0"/>
+  <control-input axis="/orientation/yaw-rate-degps" control="THROTTLE"
+           src0="0" src1="5" dst0="0" dst1="0.3"/>
 </thruster>
-<thruster x="-15" y="0" z="1" vx="0" vy="0" vz="1" thrust="300">
+<thruster x="-15" y="0" z="1" vx="0" vy="0" vz="1" thrust="200">
   <control-input axis="/controls/elevator" control="THROTTLE"
            src0="0" src1="1" dst0="0" dst1="1"/>
+  <control-input axis="/orientation/pitch-rate-degps" control="THROTTLE"
+           src0="0" src1="2" dst0="0" dst1="0.3"/>
 </thruster>
 
 <!-- wingtip jets for roll  -->
-<thruster x="-9.2" y="3.34" z="0" vx="0" vy="0" vz="1" thrust="300">
+<thruster x="-9.2" y="3.34" z="0" vx="0" vy="0" vz="1" thrust="200">
   <control-input axis="/controls/aileron" control="THROTTLE"
            src0="0" src1="1" dst0="0" dst1="1"/>
+  <control-input axis="/orientation/roll-rate-degps" control="THROTTLE"
+           src0="-2" src1="0" dst0="0.3" dst1="0"/>
 </thruster>
-<thruster x="-9.2" y="3.34" z="0" vx="0" vy="0" vz="-1" thrust="300">
+<thruster x="-9.2" y="3.34" z="0" vx="0" vy="0" vz="-1" thrust="200">
   <control-input axis="/controls/aileron" control="THROTTLE"
            src0="-1" src1="0" dst0="1" dst1="0"/>
+  <control-input axis="/orientation/roll-rate-degps" control="THROTTLE"
+           src0="0" src1="2" dst0="0" dst1="0.3"/>
 </thruster>
-<thruster x="-9.2" y="-3.34" z="0" vx="0" vy="0" vz="1" thrust="300">
+<thruster x="-9.2" y="-3.34" z="0" vx="0" vy="0" vz="1" thrust="200">
   <control-input axis="/controls/aileron" control="THROTTLE"
            src0="-1" src1="0" dst0="1" dst1="0"/>
+  <control-input axis="/orientation/roll-rate-degps" control="THROTTLE"
+           src0="0" src1="2" dst0="0" dst1="0.3"/>
 </thruster>
-<thruster x="-9.2" y="-3.34" z="0" vx="0" vy="0" vz="-1" thrust="300">
+<thruster x="-9.2" y="-3.34" z="0" vx="0" vy="0" vz="-1" thrust="200">
   <control-input axis="/controls/aileron" control="THROTTLE"
            src0="0" src1="1" dst0="0" dst1="1"/>
+  <control-input axis="/orientation/roll-rate-degps" control="THROTTLE"
+           src0="-2" src1="0" dst0="0.3" dst1="0"/>
 </thruster>
 
 <!-- nose jet for pitch up -->
-<thruster x="0" y="0" z="0" vx="0" vy="0" vz="1" thrust="300">
+<thruster x="0" y="0" z="0" vx="0" vy="0" vz="1" thrust="200">
   <control-input axis="/controls/elevator" control="THROTTLE"
            src0="-1" src1="0" dst0="1" dst1="0"/>
+  <control-input axis="/orientation/pitch-rate-degps" control="THROTTLE"
+           src0="-2" src1="0" dst0="0.3" dst1="0"/>
 </thruster>
 
 
@@ -129,13 +145,13 @@
 </gear>
 
 <!-- Wingtip gear -->
-<gear x="-8.90" y="3.24"  z="-1.5" compression="0.25">
+<gear x="-8.90" y="3.24"  z="-1.41" compression="0.25" castering="1">
   <control-input axis="/controls/gear-down" control="EXTEND"/>
   <control-output control="EXTEND" prop="/gear/gear[2]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>
 </gear>
 
-<gear x="-8.90" y="-3.24" z="-1.5" compression="0.25">
+<gear x="-8.90" y="-3.24" z="-1.41" compression="0.25" castering="1">
   <control-input axis="/controls/gear-down" control="EXTEND"/>
   <control-output control="EXTEND" prop="/gear/gear[3]/position-norm"/>
   <control-speed control="EXTEND" transition-time="7"/>