diff --git a/Data/AI/aircraft_demo.xml b/Data/AI/aircraft_demo.xml
index 3df70be59..a5c883bd2 100644
--- a/Data/AI/aircraft_demo.xml
+++ b/Data/AI/aircraft_demo.xml
@@ -1,5 +1,20 @@
 <?xml version="1.0"?>
 
+<!-- Notes:
+
+     This scenario has a 737 takeoff from runway 28L at KSFO
+     and fly the Porte Departure to the south.  You can change
+     the aircraft type by substituting another model in the
+     <model> tag, and you can also change the "flight plan" by
+     changing the <flightplan> tag. Look in the subdirectory 
+     FlightPlans to find some that I've already defined, including
+     some arrivals.  When an AI aircraft gets to the end of its
+     flight plan it deletes itself. 
+
+     Dave Culp, davidculp2@comcast.net
+
+-->
+
 <PropertyList>
 
  <scenario>
diff --git a/Data/AI/ballistic_demo.xml b/Data/AI/ballistic_demo.xml
deleted file mode 100644
index 609aa106e..000000000
--- a/Data/AI/ballistic_demo.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
- 
-<PropertyList>
-
- <scenario>
-
-  <entry>
-   <type>ballistic</type>
-   <path>Models/Geometry/rocket.xml</path>
-   <speed type="double">500.0</speed>
-   <altitude type="double">50.0</altitude>
-   <longitude type="double">-122.39</longitude>
-   <latitude type="double">37.62</latitude>
-   <heading type="double">200.0</heading>
-   <azimuth type="double">70.0</azimuth>
-   <elevation type="double">45.0</elevation>
-  </entry>
-
- </scenario>
-
-</PropertyList>
\ No newline at end of file
diff --git a/Data/AI/carrier_demo.xml b/Data/AI/carrier_demo.xml
deleted file mode 100755
index b00d0b0f8..000000000
--- a/Data/AI/carrier_demo.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-  <PropertyList> 
-    <scenario> 
-      <!-- Puts a carrier in the bay just east of KSFO -->
-      <entry> 
-        <type>carrier</type>
-        <model>Models/Geometry/Nimitz/carrier.xml</model>
-        <latitude>37.63</latitude>
-        <longitude>-122.34</longitude>
-        <speed>15</speed>
-        <heading>280</heading>
-        <rudder>0</rudder>
-        <turn-radius-ft>3000</turn-radius-ft>
-      </entry>
-    </scenario>
-  </PropertyList>
diff --git a/Data/AI/refueling_demo.xml b/Data/AI/refueling_demo.xml
index cdd9463e9..bd1d88420 100644
--- a/Data/AI/refueling_demo.xml
+++ b/Data/AI/refueling_demo.xml
@@ -1,4 +1,30 @@
 <?xml version="1.0"?>
+
+<!-- Notes:
+
+     The following scenario puts an aerial tanker in orbit over KSFO
+     at 3000 ft AGL. The tanker uses the 737 model, but you can use any
+     model (a KC-135 model can be found at:
+     http://home.comcast.net/~davidculp2/hangar/hangar.html).
+     The center of the orbit is actually west of KSFO, and the eastern
+     edge of the orbit passes over the airport.  Note that AI aircraft
+     do not react to wind, therefore your speed and bank angle will have
+     to vary along the orbit since your "user" aircraft *does* react to
+     the wind.
+
+     I recommend using the T-38 as your airplane for four reasons: (1) it
+     has a radar screen which may be needed to find the tanker;  (2) it
+     has the speed to catch the tanker; (3) it uses a JSBSim FDM, which
+     means it can onload fuel; (4) it has a green light added to the
+     instrument panel, between the fuel gauges, which comes on when you
+     are in the refueling envelope.
+
+     Right now the air refueling envelope is very loose, and I plan on
+     tightening it up in the future.  Currently no aerodynamic effects
+     of refueling are modeled (i.e downwash, bow wave, vortices).
+
+     Dave Culp,  davidculp2@comcast.net
+-->
  
 <PropertyList>
 
diff --git a/Data/AI/saratoga.xml b/Data/AI/saratoga.xml
deleted file mode 100644
index 9f3b72093..000000000
--- a/Data/AI/saratoga.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-
-<PropertyList>
-
- <scenario>
-
-  <!-- Puts the Saratoga in the bay just east of KSFO -->
-  <entry>
-   <type>carrier</type>
-   <model>Models/Geometry/saratoga.ac</model>
-   <latitude>37.63</latitude>
-   <longitude>-122.34</longitude>
-   <heading>330</heading>
-   <speed>20.0</speed>
-   <rudder>0.0</rudder>
-  </entry>
-
- </scenario>
-
-</PropertyList>
\ No newline at end of file
diff --git a/Data/AI/ship_demo.xml b/Data/AI/ship_demo.xml
index f7529e086..499a09b31 100644
--- a/Data/AI/ship_demo.xml
+++ b/Data/AI/ship_demo.xml
@@ -1,10 +1,20 @@
 <?xml version="1.0"?>
 
+<!-- Notes:
+
+     This scenario puts a sailboat in the bay just east
+     of KSFO.  The <rudder> tag works similarly to the
+     <bank> tag for AI aircraft, except that the ship will
+     turn but not bank (i.e. will not heel).  Use small
+     values for <rudder> for best effect.
+
+     Dave Culp, davidculp2@comcast.net
+-->
+
 <PropertyList>
 
  <scenario>
 
-  <!-- Puts a sailboat in the bay just east of KSFO -->
   <entry>
    <type>ship</type>
    <model>Models/Geometry/sailboat.xml</model>
diff --git a/Data/AI/thermal_demo.xml b/Data/AI/thermal_demo.xml
index 47dddab3d..25fc1b929 100644
--- a/Data/AI/thermal_demo.xml
+++ b/Data/AI/thermal_demo.xml
@@ -1,11 +1,23 @@
 <?xml version="1.0"?>
+
+<!-- Notes:
+
+     This scenario puts a thermal over the tower at KSFO.
+     The <height> tag defines the upper limit of the thermal.
+     AI thermals have some limitations, i.e. they don't lean
+     downwind, they are only cylindrical in shape, they don't
+     interact with the terrain or weather, and AFAIK they only
+     work with the JSBSim FDM.  Try using the sgs233 model for
+     a good demonstration.
+
+     Dave Culp, davidculp2@comcast.net
+-->
  
 <PropertyList>
 
  <scenario>
 
   <entry>
-   <!-- puts a thermal over the control tower at KSFO -->
    <type>thermal</type>
    <latitude>37.61633</latitude>
    <longitude>-122.38334</longitude>
diff --git a/Data/AI/thunderstorm_demo.xml b/Data/AI/thunderstorm_demo.xml
index 4cfb04baf..af96f019a 100644
--- a/Data/AI/thunderstorm_demo.xml
+++ b/Data/AI/thunderstorm_demo.xml
@@ -1,18 +1,30 @@
 <?xml version="1.0"?>
 
+<!-- Notes:
+
+     This scenario puts a thunderstorm over San Francisco 
+     at 4000 feet MSL.  The "waist" of the thunderstorm is at
+     4000 feet, with parts extending above and below it.  The
+     storm is moving on a true heading of 100 degrees, at a
+     ground speed of 25 knots.  AI thunderstorms do not (yet)
+     interact with the "user" airplane.  It also does not
+     interact with terrain. 
+
+     Dave Culp, davidculp2@comcast.net 
+-->
+
 <PropertyList>
 
  <scenario>
 
-  <!-- Puts a thunderstorm southwest of KSFO -->
   <entry>
    <type>thunderstorm</type>
    <model>Models/Geometry/thunderstorm.xml</model>
-   <latitude>37.44</latitude>
-   <longitude>-122.25</longitude>
+   <latitude>37.7</latitude>
+   <longitude>-122.5</longitude>
    <speed>25.0</speed>
    <altitude>4000.0</altitude>
-   <heading>70.0</heading>
+   <heading>100.0</heading>
   </entry>
 
  </scenario>