diff --git a/Aircraft/Generic/Effects/null_bumpspec.png b/Aircraft/Generic/Effects/null_bumpspec.png
new file mode 100644
index 000000000..8d65741bf
Binary files /dev/null and b/Aircraft/Generic/Effects/null_bumpspec.png differ
diff --git a/Aircraft/Generic/WalkView/walkview.nas b/Aircraft/Generic/WalkView/walkview.nas
index 0824dc229..cecd081c6 100644
--- a/Aircraft/Generic/WalkView/walkview.nas
+++ b/Aircraft/Generic/WalkView/walkview.nas
@@ -362,7 +362,7 @@ var TO_DEG = 180/math.pi;
 var walkers = {};
 
 var closerXY = func (pos, p1, p2) {
-    l1 = [p1[0] - pos[0], p1[1] - pos[1]];
-    l2 = [p2[0] - pos[0], p2[1] - pos[1]];
+    var l1 = [p1[0] - pos[0], p1[1] - pos[1]];
+    var l2 = [p2[0] - pos[0], p2[1] - pos[1]];
     return (l1[0]*l1[0] + l1[1]*l1[1]) - (l2[0]*l2[0] + l2[1]*l2[1]);
 }
diff --git a/Aircraft/c172p/Instruments/kap140/KAP140TwoAxisAlt.xml b/Aircraft/c172p/Instruments/kap140/KAP140TwoAxisAlt.xml
index 02ee2b61d..a9666f23c 100644
--- a/Aircraft/c172p/Instruments/kap140/KAP140TwoAxisAlt.xml
+++ b/Aircraft/c172p/Instruments/kap140/KAP140TwoAxisAlt.xml
@@ -279,7 +279,10 @@ properties' values.
   <animation>
     <type>select</type>
     <object-name>vs-minus</object-name>
-    <object-name>vs-digits-minus</object-name>
+    <object-name>vs-digit2-minus</object-name>
+    <object-name>vs-digit3-minus</object-name>
+    <object-name>vs-digit4-minus</object-name>
+    <object-name>vs-digit5-minus</object-name>
     <condition>
       <and>
         <equals>
@@ -287,15 +290,18 @@ properties' values.
           <value type="bool">true</value>
         </equals>
         <greater-than>
-          <value>0</value>
           <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+          <value>0</value>
         </greater-than>
       </and>
     </condition>
   </animation>
   <animation>
     <type>select</type>
-    <object-name>vs-digits</object-name>
+    <object-name>vs-digit2</object-name>
+    <object-name>vs-digit3</object-name>
+    <object-name>vs-digit4</object-name>
+    <object-name>vs-digit5</object-name>
     <condition>
       <and>
         <equals>
@@ -303,8 +309,8 @@ properties' values.
           <value type="bool">true</value>
         </equals>
         <less-than>
-          <value>0</value>
           <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+          <value>0</value>
         </less-than>
       </and>
     </condition>
@@ -312,11 +318,10 @@ properties' values.
   <animation>
     <type>textranslate</type>
     <object-name>vs-digit5</object-name>
-    <property>/autopilot/KAP140/settings/target-pressure-rate</property>
     <condition>
       <less-than>
-        <value>0</value>
         <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+        <value>0</value>
       </less-than>
     </condition>
     <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@@ -331,11 +336,10 @@ properties' values.
   <animation>
     <type>textranslate</type>
     <object-name>vs-digit4</object-name>
-    <property>/autopilot/KAP140/settings/target-pressure-rate</property>
     <condition>
       <less-than>
-        <value>0</value>
         <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+        <value>0</value>
       </less-than>
     </condition>
     <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@@ -350,11 +354,10 @@ properties' values.
   <animation>
     <type>textranslate</type>
     <object-name>vs-digit3</object-name>
-    <property>/autopilot/KAP140/settings/target-pressure-rate</property>
     <condition>
       <less-than>
-        <value>0</value>
         <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+        <value>0</value>
       </less-than>
     </condition>
     <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@@ -369,11 +372,10 @@ properties' values.
   <animation>
     <type>textranslate</type>
     <object-name>vs-digit2</object-name>
-    <property>/autopilot/KAP140/settings/target-pressure-rate</property>
     <condition>
       <less-than>
-        <value>0</value>
         <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+        <value>0</value>
       </less-than>
     </condition>
     <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@@ -388,11 +390,10 @@ properties' values.
   <animation>
     <type>textranslate</type>
     <object-name>vs-digit5-minus</object-name>
-    <property>/autopilot/KAP140/settings/target-pressure-rate</property>
     <condition>
       <greater-than>
-        <value>0</value>
         <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+        <value>0</value>
       </greater-than>
     </condition>
     <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@@ -407,11 +408,10 @@ properties' values.
   <animation>
     <type>textranslate</type>
     <object-name>vs-digit4-minus</object-name>
-    <property>/autopilot/KAP140/settings/target-pressure-rate</property>
     <condition>
       <greater-than>
-        <value>0</value>
         <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+        <value>0</value>
       </greater-than>
     </condition>
     <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@@ -426,11 +426,10 @@ properties' values.
   <animation>
     <type>textranslate</type>
     <object-name>vs-digit3-minus</object-name>
-    <property>/autopilot/KAP140/settings/target-pressure-rate</property>
     <condition>
       <greater-than>
-        <value>0</value>
         <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+        <value>0</value>
       </greater-than>
     </condition>
     <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@@ -445,11 +444,10 @@ properties' values.
   <animation>
     <type>textranslate</type>
     <object-name>vs-digit2-minus</object-name>
-    <property>/autopilot/KAP140/settings/target-pressure-rate</property>
     <condition>
       <greater-than>
-        <value>0</value>
         <property>/autopilot/KAP140/settings/target-pressure-rate</property>
+        <value>0</value>
       </greater-than>
     </condition>
     <property>/autopilot/KAP140/settings/target-pressure-rate</property>
@@ -911,5 +909,5 @@ properties' values.
       </binding>
     </action>
   </animation>
-  
+
 </PropertyList>
diff --git a/Effects/reflect-bump-spec.eff b/Effects/reflect-bump-spec.eff
new file mode 100644
index 000000000..e9dd7f0c3
--- /dev/null
+++ b/Effects/reflect-bump-spec.eff
@@ -0,0 +1,316 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Reflections + Bumpmapping + specular
+
+PARAMETERS: There are two forms of cube map texture:- vertical cross and 6 images.
+Either can be used - alternative forms are shown in <parameters> and in <texture-unit>
+
+The reflection is set proportional to the shininess of the material. Thus by 
+varying the material shininess value over or between objects the amount of 
+refection can be controlled. The overall amount of reflection may be 
+adjusted by the use of <refl_correction> -1.0 (fully transparent)- 1.0 (fully opaque).
+
+The overall values of the noisiness, coloured fringing or fresnel effect may be adjusted
+by the use of <noisiness>, <rainbowiness> and <fresneliness>.
+
+If your result is too dark/too light the overall ambient light value can be adjusted
+by the use of <ambient_correction>. This correction also takes out some of the blueness
+added as default to compensate for the lack of reflection.
+
+To use a reflection map set <reflect_map> to 1,and the path to the map texture in 
+<texture n="8">
+
+A default, null, bumpspec is specified as texture unit 4. To provide a custom bumpspec map,
+define <texture n="4"> in the derived effect file
+
+USE: 	To use the default reflection effect (controlled by material shininess values) use 
+	
+	<effect>
+			<inherits-from>Effects/reflect-bump-spec</inherits-from>
+			<object-name>Fuselage</object-name>
+	</effect>
+	
+			To use your own reflection effect, use
+			
+	<effect>
+		<inherits-from>Aircraft/Lightning/Models/Effects/lightningreflect</inherits-from>
+		<object-name>Fuselage</object-name>
+	</effect>
+	
+in your model file.
+
+To use your own effect place your efffect file containing something like this:
+
+	<name>Effects/lightningreflect</name>
+	<inherits-from>Effects/reflect-bump-spec</inherits-from>
+	
+	and the the modified tags in the path as above
+
+EXAMPLES: You can find examples of both usages in the Hunter and Lightning models.
+-->
+<PropertyList>
+	<name>Effects/reflect-bump-spec</name>
+	<inherits-from>Effects/model-default</inherits-from>
+
+	<parameters>
+		<texture n="4">
+			<image>Aircraft/Generic/Effects/null_bumpspec.png</image>
+			<filter>linear-mipmap-linear</filter>
+			<wrap-s>repeat</wrap-s>
+			<wrap-t>repeat</wrap-t>
+			<internal-format>normalized</internal-format>
+		</texture>
+		<texture n="5">
+			<type>cubemap</type>
+			<!-- use this form for a cube cross -->
+			<!--<image>Aircraft/Generic/Effects/CubeCrosses/blue_sky_big.jpg</image>-->
+
+			<!-- use this form for a 6 image cube map -->
+			<images>
+				<positive-x>Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_px.png</positive-x>
+				<negative-x>Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_nx.png</negative-x>
+				<positive-y>Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_py.png</positive-y>
+				<negative-y>Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_ny.png</negative-y>
+				<positive-z>Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_pz.png</positive-z>
+				<negative-z>Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_nz.png</negative-z>
+			</images>
+
+		</texture>
+		<texture n="6">
+			<image>Aircraft/Generic/Effects/Rainbow.png</image>
+			<filter>linear-mipmap-linear</filter>
+			<wrap-s>repeat</wrap-s>
+			<wrap-t>repeat</wrap-t>
+			<internal-format>normalized</internal-format>
+		</texture>
+		<texture n="7">
+			<image>Aircraft/Generic/Effects/FresnelLookUp.png</image>
+			<filter>linear-mipmap-linear</filter>
+			<wrap-s>repeat</wrap-s>
+			<wrap-t>repeat</wrap-t>
+			<internal-format>normalized</internal-format>
+		</texture>
+		<texture n="8">
+			<image>Aircraft/737-300/Models/Effects/733LH.ReflectionMap3.png</image>
+			<filter>linear-mipmap-linear</filter>
+			<wrap-s>repeat</wrap-s>
+			<wrap-t>repeat</wrap-t>
+			<internal-format>normalized</internal-format>
+		</texture>
+		<rendering-hint>transparent</rendering-hint>
+		<shade-model>smooth</shade-model>
+		<rainbowiness type="float">0.01</rainbowiness>
+		<fresneliness>0.1</fresneliness>
+		<noisiness>0.25</noisiness>
+		<refl_correction>0.0</refl_correction>
+		<ambient_correction>0.05</ambient_correction>
+		<reflect_map>0</reflect_map>
+	</parameters>
+
+	<generate>
+		<tangent type="int">6</tangent>
+		<binormal type="int">7</binormal>
+	</generate>
+	
+	<technique n="9">
+		<predicate>
+			<and>
+				<property>/sim/rendering/shader-effects</property>
+				<or>
+					<less-equal>
+						<value type="float">2.0</value>
+						<glversion/>
+					</less-equal>
+					<and>
+						<extension-supported>GL_ARB_shader_objects</extension-supported>
+						<extension-supported>GL_ARB_shading_language_100</extension-supported>
+						<extension-supported>GL_ARB_vertex_shader</extension-supported>
+						<extension-supported>GL_ARB_fragment_shader</extension-supported>
+					</and>
+				</or>
+			</and>
+		</predicate>
+
+		<pass>
+			<lighting>true</lighting>
+			<material>
+				<active><use>material/active</use></active>
+				<ambient><use>material/ambient</use></ambient>
+				<diffuse><use>material/diffuse</use></diffuse>
+				<specular><use>material/specular</use></specular>
+				<emissive><use>material/emissive</use></emissive>
+				<shininess><use>material/shininess</use></shininess>
+				<color-mode><use>material/color-mode</use></color-mode>
+			</material>
+			<blend>
+				<active><use>blend/active</use></active>
+				<source><use>blend/source</use></source>
+				<destination><use>blend/destination</use></destination>
+			</blend>
+			<shade-model><use>shade-model</use></shade-model>
+			<cull-face><use>cull-face</use></cull-face>
+			<rendering-hint><use>rendering-hint</use></rendering-hint>
+
+			<texture-unit>
+				<unit>0</unit>
+				<image><use>texture[0]/image</use></image>
+				<filter><use>texture[0]/filter</use></filter>
+				<wrap-s><use>texture[0]/wrap-s</use></wrap-s>
+				<wrap-t><use>texture[0]/wrap-t</use></wrap-t>
+				<internal-format><use>texture[0]/internal-format</use></internal-format>
+			</texture-unit>
+
+			<texture-unit>
+				<unit>4</unit>
+				<image><use>texture[4]/image</use></image>
+				<filter><use>texture[4]/filter</use></filter>
+				<wrap-s><use>texture[4]/wrap-s</use></wrap-s>
+				<wrap-t><use>texture[4]/wrap-t</use></wrap-t>
+				<internal-format><use>texture[4]/internal-format</use></internal-format>
+			</texture-unit>
+			
+			<texture-unit>
+				<unit>5</unit>
+				<type><use>texture[5]/type</use></type>
+
+				<!-- use this form for a cube cross -->
+				<!--<image><use>texture[5]/image</use></image>-->
+
+				<!-- use this form for a 6 image cube map -->
+				<images><use>texture[5]/images</use></images>
+			</texture-unit>
+
+			<texture-unit>
+				<unit>6</unit>
+				<type><use>texture[6]/type</use></type>
+				<image><use>texture[6]/image</use></image>
+				<filter><use>texture[6]/filter</use></filter>
+				<wrap-s><use>texture[6]/wrap-s</use></wrap-s>
+				<wrap-t><use>texture[6]/wrap-t</use></wrap-t>
+			</texture-unit>
+
+			<texture-unit>
+				<unit>7</unit>
+				<type><use>texture[7]/type</use></type>
+				<image><use>texture[7]/image</use></image>
+				<filter><use>texture[7]/filter</use></filter>
+				<wrap-s><use>texture[7]/wrap-s</use></wrap-s>
+				<wrap-t><use>texture[7]/wrap-t</use></wrap-t>
+			</texture-unit>
+
+			<texture-unit>
+				<unit>8</unit>
+				<image><use>texture[8]/image</use></image>
+				<filter><use>texture[8]/filter</use></filter>
+				<wrap-s><use>texture[8]/wrap-s</use></wrap-s>
+				<wrap-t><use>texture[8]/wrap-t</use></wrap-t>
+				<internal-format><use>texture[0]/internal-format</use></internal-format>
+			</texture-unit>
+
+			<texture-unit>
+				<unit>9</unit>
+				<type>noise</type>
+			</texture-unit>
+
+
+			<program>
+				<vertex-shader>Shaders/reflect-bump-spec.vert</vertex-shader>
+				<fragment-shader>Shaders/reflect-bump-spec.frag</fragment-shader>
+				<attribute>
+					<name>tangent</name>
+					<index>6</index>
+				</attribute>
+				<attribute>
+					<name>binormal</name>
+					<index>7</index>
+				</attribute>
+			</program>
+
+			<uniform>
+				<name>BaseTex</name>
+				<type>sampler-2d</type>
+				<value type="int">0</value>
+			</uniform>
+
+			<uniform>
+				<name>NormalTex</name>
+				<type>sampler-2d</type>
+				<value type="int">4</value>
+			</uniform>
+
+			<uniform>
+				<name>Environment</name>
+				<type>sampler-cube</type>
+				<value type="int">5</value>
+			</uniform>
+
+			<uniform>
+				<name>Rainbow</name>
+				<type>sampler-2d</type>
+				<value type="int">6</value>
+			</uniform>
+
+			<uniform>
+				<name>Fresnel</name>
+				<type>sampler-2d</type>
+				<value type="int">7</value>
+			</uniform>
+
+			<uniform>
+				<name>Map</name>
+				<type>sampler-2d</type>
+				<value type="int">8</value>
+			</uniform>
+
+			<uniform>
+				<name>Noise</name>
+				<type>sampler-3d</type>
+				<value type="int">9</value>
+			</uniform>
+
+			<!-- set the amount of fringing colour 0.0 - 1.0 -->
+			<uniform>
+				<name>rainbowiness</name>
+				<type>float</type>
+				<value><use>rainbowiness</use></value>
+			</uniform>
+
+			<!-- set the amount of fresnel effect colour 0.0 - 1.0 -->
+			<uniform>
+				<name>fresneliness</name>
+				<type>float</type>
+				<value><use>fresneliness</use></value>
+			</uniform>
+
+			<!-- set the amount of noisiness 0.0 - 1.0 -->
+			<uniform>
+				<name>noisiness</name>
+				<type>float</type>
+				<value><use>noisiness</use></value>
+			</uniform>
+
+			<!-- The reflection is set proportional to the shininess of the material. 
+			The amount of reflection may be adjusted by the use of this correction
+			-1.0 (fully transparent)- 1.0 (fully opaque) -->
+			<uniform>
+				<name>refl_correction</name>
+				<type>float</type>
+				<value><use>refl_correction</use></value>
+			</uniform>
+
+			<!-- set the amount of ambient light correction 0.0 - 1.0  -->
+			<uniform>
+				<name>ambient_correction</name>
+				<type>float</type>
+				<value><use>ambient_correction</use></value>
+			</uniform>
+
+			<!-- use a reflection map-->
+			<uniform>
+				<name>reflect_map</name>
+				<type>float</type>
+				<value><use>reflect_map</use></value>
+			</uniform>
+
+		</pass>
+	</technique>
+</PropertyList>
diff --git a/Effects/water.eff b/Effects/water.eff
index 171ec5c3c..248950cb6 100644
--- a/Effects/water.eff
+++ b/Effects/water.eff
@@ -2,6 +2,150 @@
 <PropertyList>
   <name>Effects/water</name>
   <inherits-from>Effects/terrain-default</inherits-from>
+  <parameters>
+    <texture n="0">
+        <image>Textures/Water/water-reflection.png</image>
+        <filter>linear-mipmap-linear</filter>
+        <wrap-s>repeat</wrap-s>
+        <wrap-t>repeat</wrap-t>
+        <internal-format>normalized</internal-format>
+    </texture>
+    <texture n="1">
+        <image>Textures/Water/water-refraction.png</image>
+        <filter>linear-mipmap-linear</filter>
+        <wrap-s>repeat</wrap-s>
+        <wrap-t>repeat</wrap-t>
+        <internal-format>normalized</internal-format>
+    </texture>
+    <texture n="2">
+        <image>Textures/Water/water-normalmap.png</image>
+        <filter>linear-mipmap-linear</filter>
+        <wrap-s>repeat</wrap-s>
+        <wrap-t>repeat</wrap-t>
+        <internal-format>normalized</internal-format>
+    </texture>
+    <texture n="3">
+        <image>Textures/Water/water-dudv.png</image>
+        <filter>linear-mipmap-linear</filter>
+        <wrap-s>repeat</wrap-s>
+        <wrap-t>repeat</wrap-t>
+        <internal-format>normalized</internal-format>
+    </texture>
+	<saturation>
+		<use>/rendering/scene/saturation</use>
+	</saturation>
+  </parameters>
+  <technique n="8">
+    <predicate>
+      <and>
+        <property>/sim/rendering/water-shader</property>
+        <property>/sim/rendering/shader-effects</property>
+        <less-equal>
+	  		<value type="float">2.0</value>
+	  		<float-property>/sim/rendering/quality-level</float-property>
+		</less-equal>
+        <or>
+          <less-equal>
+            <value type="float">2.0</value>
+            <glversion/>
+          </less-equal>
+          <and>
+            <extension-supported>GL_ARB_shader_objects</extension-supported>
+            <extension-supported>GL_ARB_shading_language_100</extension-supported>
+            <extension-supported>GL_ARB_vertex_shader</extension-supported>
+            <extension-supported>GL_ARB_fragment_shader</extension-supported>
+          </and>
+        </or>
+      </and>
+    </predicate>
+    <pass>
+      <lighting>true</lighting>
+      <material>
+        <ambient><use>material/ambient</use></ambient>
+        <diffuse><use>material/diffuse</use></diffuse>
+        <specular><use>material/specular</use></specular>
+        <color-mode>ambient-and-diffuse</color-mode>
+      </material>
+      <blend><use>transparent</use></blend>
+      <alpha-test><use>transparent</use></alpha-test>
+      <shade-model>smooth</shade-model>
+      <cull-face>back</cull-face>
+      <render-bin>
+        <bin-number><use>render-bin/bin-number</use></bin-number>
+        <bin-name><use>render-bin/bin-name</use></bin-name>
+      </render-bin>
+	  <texture-unit>
+        <unit>0</unit>
+          <image><use>texture[0]/image</use></image>
+          <filter><use>texture[0]/filter</use></filter>
+          <wrap-s><use>texture[0]/wrap-s</use></wrap-s>
+          <wrap-t><use>texture[0]/wrap-t</use></wrap-t>
+          <internal-format>
+            <use>texture[0]/internal-format</use>
+          </internal-format>
+      </texture-unit>
+      <texture-unit>
+        <unit>1</unit>
+          <image><use>texture[1]/image</use></image>
+          <filter><use>texture[1]/filter</use></filter>
+          <wrap-s><use>texture[1]/wrap-s</use></wrap-s>
+          <wrap-t><use>texture[1]/wrap-t</use></wrap-t>
+          <internal-format>
+            <use>texture[1]/internal-format</use>
+          </internal-format>
+      </texture-unit>
+      <texture-unit>
+        <unit>2</unit>
+          <image><use>texture[2]/image</use></image>
+          <filter><use>texture[2]/filter</use></filter>
+          <wrap-s><use>texture[2]/wrap-s</use></wrap-s>
+          <wrap-t><use>texture[2]/wrap-t</use></wrap-t>
+          <internal-format>
+            <use>texture[2]/internal-format</use>
+          </internal-format>
+      </texture-unit>
+      <texture-unit>
+        <unit>3</unit>
+          <image><use>texture[3]/image</use></image>
+          <filter><use>texture[3]/filter</use></filter>
+          <wrap-s><use>texture[3]/wrap-s</use></wrap-s>
+          <wrap-t><use>texture[3]/wrap-t</use></wrap-t>
+          <internal-format>
+            <use>texture[3]/internal-format</use>
+          </internal-format>
+      </texture-unit>
+      <program>
+        <vertex-shader>Shaders/water.vert</vertex-shader>
+        <fragment-shader>Shaders/water.frag</fragment-shader>
+      </program>
+      <uniform>
+        <name>water_reflection</name>
+        <type>sampler-2d</type>
+        <value type="int">0</value>
+      </uniform>
+      <uniform>
+        <name>water_refraction</name>
+        <type>sampler-2d</type>
+        <value type="int">1</value>
+      </uniform>
+            <uniform>
+        <name>water_normalmap</name>
+        <type>sampler-2d</type>
+        <value type="int">2</value>
+      </uniform>
+      <uniform>
+        <name>water_dudvmap</name>
+        <type>sampler-2d</type>
+        <value type="int">3</value>
+      </uniform>
+      <uniform>
+		<name>saturation</name>
+		<type>float</type>
+		<value>0.4</value>
+		<!--<value><use>saturation</use></value>-->
+      </uniform>
+    </pass>
+  </technique>
   <technique n="9">
     <predicate>
       <and>
@@ -42,8 +186,8 @@
         <type>noise</type>
       </texture-unit>
       <program>
-        <vertex-shader>Shaders/water.vert</vertex-shader>
-        <fragment-shader>Shaders/water.frag</fragment-shader>
+        <vertex-shader>Shaders/water-orig.vert</vertex-shader>
+        <fragment-shader>Shaders/water-orig.frag</fragment-shader>
       </program>
       <uniform>
       <name>texture</name>
diff --git a/Environment/metarinterpolator.xml b/Environment/metarinterpolator.xml
index 2c027ea10..c67cb2ab5 100644
--- a/Environment/metarinterpolator.xml
+++ b/Environment/metarinterpolator.xml
@@ -28,7 +28,7 @@
     -->
     <name>MetarController:pressure-sea-level-inhg</name>
     <type>noise-spike</type>
-    <max-rate-of-change>0.0003</max-rate-of-change>
+    <max-rate-of-change>0.006</max-rate-of-change>
     <enable>
       <condition>
         <property>/environment/metar/valid</property>
diff --git a/Input/Keyboard/multikey.xml b/Input/Keyboard/multikey.xml
index c6b0a1608..6b9e01307 100644
--- a/Input/Keyboard/multikey.xml
+++ b/Input/Keyboard/multikey.xml
@@ -89,16 +89,6 @@
 			</binding>
 		</key>
 
-		<key n="99">
-			<name>c</name>
-			<desc>Clouds</desc>
-			<exit/>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>clouds</dialog-name>
-			</binding>
-		</key>
-
 		<key n="102">
 			<name>f</name>
 			<desc>Fuel and Payload</desc>
@@ -241,7 +231,6 @@
 						<command>nasal</command>
 						<script>
 							setprop("/environment/weather-scenario", "Fair weather");
-							setprop("/environment/rebuild-layers", getprop("/environment/rebuild-layers") + 1);
 						</script>
 					</binding>
 				</key>
@@ -253,7 +242,6 @@
 						<command>nasal</command>
 						<script>
 							setprop("/environment/weather-scenario", "METAR");
-							setprop("/environment/rebuild-layers", getprop("/environment/rebuild-layers") + 1);
 						</script>
 					</binding>
 				</key>
@@ -265,7 +253,6 @@
 						<command>nasal</command>
 						<script>
 							setprop("/environment/weather-scenario", "none");
-							setprop("/environment/rebuild-layers", getprop("/environment/rebuild-layers") + 1);
 						</script>
 					</binding>
 				</key>
@@ -277,7 +264,6 @@
 						<command>nasal</command>
 						<script>
 							setprop("/environment/weather-scenario", "Thunderstorm");
-							setprop("/environment/rebuild-layers", getprop("/environment/rebuild-layers") + 1);
 						</script>
 					</binding>
 				</key>
diff --git a/Nasal/mp_broadcast.nas b/Nasal/mp_broadcast.nas
index cabef40ac..702a3372d 100644
--- a/Nasal/mp_broadcast.nas
+++ b/Nasal/mp_broadcast.nas
@@ -45,24 +45,25 @@ BroadcastChannel.new = func (mpp_path, process,
                              accept_predicate = nil,
                              on_disconnect = nil,
                              enable_send=1) {
-  obj = { parents      : [BroadcastChannel],
-          mpp_path     : mpp_path,
-          send_node    : enable_send ? props.globals.getNode(mpp_path, 1) 
-                                     : nil,
-          process_msg  : process,
-          send_to_self : send_to_self,
-          accept_predicate : (accept_predicate != nil) ? accept_predicate :
-                                                         func (p) { return 1; },
-          on_disconnect    : (on_disconnect != nil) ? on_disconnect :
-                                                      func (p) { return; },
-          # Internal state.
-          send_buf     : [],
-          peers        : {},
-          loopid       : 0,
-          PERIOD       : 1.3,
-          last_time    : 0.0,  # For join handling.
-          last_send    : 0.0,  # For the send queue 
-          SEND_TIME    : 0.5 };
+  var obj = { parents      : [BroadcastChannel],
+              mpp_path     : mpp_path,
+              send_node    : enable_send ? props.globals.getNode(mpp_path, 1) 
+                                         : nil,
+              process_msg  : process,
+              send_to_self : send_to_self,
+              accept_predicate :
+                (accept_predicate != nil) ? accept_predicate
+                                          : func (p) { return 1; },
+              on_disconnect : (on_disconnect != nil) ? on_disconnect
+                                                     : func (p) { return; },
+              # Internal state.
+              send_buf     : [],
+              peers        : {},
+              loopid       : 0,
+              PERIOD       : 1.3,
+              last_time    : 0.0,  # For join handling.
+              last_send    : 0.0,  # For the send queue 
+              SEND_TIME    : 0.5 };
   if (enable_send and (obj.send_node == nil)) {
     printlog("warn",
              "BroadcastChannel invalid send node.");
@@ -232,10 +233,10 @@ Binary.decodeCoord = func (str) {
 #       The same object is seldom used for both sending and receiving.
 var MessageChannel = {};
 MessageChannel.new = func (n = nil, process = nil) {
-  obj = { parents     : [MessageChannel],
-          node        : n, 
-          process_msg : process,
-          old         : "" };
+  var obj = { parents     : [MessageChannel],
+              node        : n, 
+              process_msg : process,
+              old         : "" };
   return obj;
 }
 MessageChannel.update = func {
diff --git a/Nasal/multiplayer.nas b/Nasal/multiplayer.nas
index 9bf4d351f..f2843b0c6 100644
--- a/Nasal/multiplayer.nas
+++ b/Nasal/multiplayer.nas
@@ -125,8 +125,10 @@ var handle_key = func(key)
     {
       input = substr(input, 0, size(input) - 1);
       gui.popupTip(input, 1000000);
-      return 1;
     }
+
+    # Always handle key so excessive backspacing doesn't toggle the heading autopilot
+    return 1;
   }
   elsif (key == 27)
   {
diff --git a/Nasal/startup.nas b/Nasal/startup.nas
index 3d7cff973..d2d692a14 100644
--- a/Nasal/startup.nas
+++ b/Nasal/startup.nas
@@ -1,6 +1,6 @@
 var set_runway_from_metar_wind = func {
-	if (!getprop("/environment/params/real-world-weather-fetch"))
-		return printlog("info", "metar-rwy: no live weather");
+	if (!getprop("/environment/metar/valid"))
+		return printlog("info", "metar-rwy: no valid metar");
 	if (!getprop("/sim/startup/options/airport"))
 		return printlog("info", "metar-rwy: no airport requested");
 	if (getprop("/sim/startup/options/runway"))
diff --git a/Nasal/view.nas b/Nasal/view.nas
index 30b4f25a8..3642ac2e3 100644
--- a/Nasal/view.nas
+++ b/Nasal/view.nas
@@ -1,663 +1,663 @@
-##
-## view.nas
-##
-##  Nasal code for implementing view-specific functionality.
-
-var index = nil;    # current view index
-var views = nil;    # list of all view branches (/sim/view[n]) as props.Node
-var current = nil;  # current view branch (e.g. /sim/view[1]) as props.Node
-
-
-var hasmember = func(class, member) {
-	if (contains(class, member))
-		return 1;
-	if (!contains(class, "parents"))
-		return 0;
-	if (typeof(class.parents) != "vector")
-		return 0;
-	foreach (var parent; class.parents)
-		if (hasmember(parent, member))
-			return 1;
-	return 0;
-}
-
-
-# Dynamically calculate limits so that it takes STEPS iterations to
-# traverse the whole range, the maximum FOV is fixed at 120 degrees,
-# and the minimum corresponds to normal maximum human visual acuity
-# (~1 arc minute of resolution, although apparently people vary widely
-# in this ability).  Quick derivation of the math:
-#
-#   mul^steps = max/min
-#   steps * ln(mul) = ln(max/min)
-#   mul = exp(ln(max/min) / steps)
-var STEPS = 40;
-var ACUITY = 1/60; # Maximum angle subtended by one pixel (== 1 arc minute)
-var max = var min = var mul = 0;
-var calcMul = func {
-    max = 120; # Fixed at 120 degrees
-    min = getprop("/sim/startup/xsize") * ACUITY;
-    mul = math.exp(math.ln(max/min) / STEPS);
-}
-
-##
-# Handler.  Increase FOV by one step
-#
-var increase = func {
-    calcMul();
-    var val = fovProp.getValue() * mul;
-    if(val == max) { return; }
-    if(val > max) { val = max }
-    fovProp.setDoubleValue(val);
-    var popup=getprop("/sim/view-name-popup");
-    if(popup == 1 or popup==nil) gui.popupTip(sprintf("FOV: %.1f", val));
-}
-
-##
-# Handler.  Decrease FOV by one step
-#
-var decrease = func {
-    calcMul();
-    var val = fovProp.getValue() / mul;
-    fovProp.setDoubleValue(val);
-    var popup=getprop("/sim/view-name-popup");
-    if(popup == 1 or popup==nil) gui.popupTip(sprintf("FOV: %.1f%s", val, val < min ? " (overzoom)" : ""));
-}
-
-##
-# Handler.  Reset FOV to default.
-#
-var resetFOV = func {
-    setprop("/sim/current-view/field-of-view",
-            getprop("/sim/current-view/config/default-field-of-view-deg"));
-}
-
-var resetViewPos = func {
-    var v = current.getNode("config");
-    setprop("/sim/current-view/x-offset-m", v.getNode("x-offset-m", 1).getValue() or 0);
-    setprop("/sim/current-view/y-offset-m", v.getNode("y-offset-m", 1).getValue() or 0);
-    setprop("/sim/current-view/z-offset-m", v.getNode("z-offset-m", 1).getValue() or 0);
-}
-
-var resetViewDir = func {
-    setprop("/sim/current-view/goal-heading-offset-deg",
-            getprop("/sim/current-view/config/heading-offset-deg"));
-    setprop("/sim/current-view/goal-pitch-offset-deg",
-            getprop("/sim/current-view/config/pitch-offset-deg"));
-    setprop("/sim/current-view/goal-roll-offset-deg",
-            getprop("/sim/current-view/config/roll-offset-deg"));
-}
-
-##
-# Handler.  Step to the next (force=1) or next enabled view.
-#
-var stepView = func(step, force = 0) {
-    step = step > 0 ? 1 : -1;
-    var n = index;
-    for (var i = 0; i < size(views); i += 1) {
-        n += step;
-        if (n < 0)
-            n = size(views) - 1;
-        elsif (n >= size(views))
-            n = 0;
-        if (force or (var e = views[n].getNode("enabled")) == nil or e.getBoolValue())
-            break;
-    }
-    setprop("/sim/current-view/view-number", n);
-
-    # And pop up a nice reminder
-    var popup=getprop("/sim/view-name-popup");
-    if(popup == 1 or popup==nil) gui.popupTip(views[n].getNode("name").getValue());
-}
-
-##
-# Get view index by name.
-#
-var indexof = func(name) {
-    forindex (var i; views)
-        if (views[i].getNode("name", 1).getValue() == name)
-            return i;
-    return nil;
-}
-
-##
-# Standard view "slew" rate, in degrees/sec.
-#
-var VIEW_PAN_RATE = 60;
-
-##
-# Pans the view horizontally.  The argument specifies a relative rate
-# (or number of "steps" -- same thing) to the standard rate.
-#
-var panViewDir = func(step) {
-    if (getprop("/sim/freeze/master"))
-        var prop = "/sim/current-view/heading-offset-deg";
-    else
-        var prop = "/sim/current-view/goal-heading-offset-deg";
-
-    controls.slewProp(prop, step * VIEW_PAN_RATE);
-}
-
-##
-# Pans the view vertically.  The argument specifies a relative rate
-# (or number of "steps" -- same thing) to the standard rate.
-#
-var panViewPitch = func(step) {
-    if (getprop("/sim/freeze/master"))
-        var prop = "/sim/current-view/pitch-offset-deg";
-    else
-        var prop = "/sim/current-view/goal-pitch-offset-deg";
-
-    controls.slewProp(prop, step * VIEW_PAN_RATE);
-}
-
-
-##
-# Reset view to default using current view manager (see default_handler).
-#
-var resetView = func {
-	manager.reset();
-}
-
-
-##
-# Default view handler used by view.manager.
-#
-var default_handler = {
-	reset : func {
-		resetViewDir();
-		resetFOV();
-	},
-};
-
-
-##
-# View manager. Administrates optional Nasal view handlers.
-# Usage:  view.manager.register(<view-id>, <view-handler>);
-#
-#   view-id:      the view's name (e.g. "Chase View") or index number
-#   view-handler: a hash with any combination of the functions listed in the
-#                 following example, or none at all. Only define the interface
-#                 functions that you really need! The hash may contain local
-#                 variables and other, non-interface functions.
-#
-# Example:
-#
-#   var some_view_handler = {
-#           init   : func {},    # called only once at startup
-#           start  : func {},    # called when view is switched to our view
-#           stop   : func {},    # called when view is switched away from our view
-#           reset  : func {},    # called with view.resetView()
-#           update : func { 0 }, # called iteratively if defined. Must return
-#   };                           # interval in seconds until next invocation
-#                                # Don't define it if you don't need it!
-#
-#   view.manager.register("Some View", some_view_handler);
-#
-#
-var manager = {
-	current : { node: nil, handler: default_handler },
-	init : func {
-		me.views = {};
-		me.loopid = 0;
-		var viewnodes = props.globals.getNode("sim").getChildren("view");
-		forindex (var i; viewnodes)
-			me.views[i] = { node: viewnodes[i], handler: default_handler };
-		setlistener("/sim/current-view/view-number", func(n) {
-			manager.set_view(n.getValue());
-		}, 1);
-	},
-	register : func(which, handler = nil) {
-		if (num(which) == nil)
-			which = indexof(which);
-		if (handler == nil)
-			handler = default_handler;
-		me.views[which]["handler"] = handler;
-		if (hasmember(handler, "init"))
-			handler.init(me.views[which].node);
-		me.set_view();
-	},
-	set_view : func(which = nil) {
-		if (which == nil)
-			which = index;
-		elsif (num(which) == nil)
-			which = indexof(which);
-
-		me.loopid += 1;
-		if (hasmember(me.current.handler, "stop"))
-			me.current.handler.stop();
-
-		me.current = me.views[which];
-
-		if (hasmember(me.current.handler, "start"))
-			me.current.handler.start();
-		if (hasmember(me.current.handler, "update"))
-			me._loop_(me.loopid += 1);
-	},
-	reset : func {
-		if (hasmember(me.current.handler, "reset"))
-			me.current.handler.reset();
-		else
-			default_handler.reset();
-	},
-	_loop_ : func(id) {
-		id == me.loopid or return;
-		settimer(func { me._loop_(id) }, me.current.handler.update() or 0);
-	},
-};
-
-
-var fly_by_view_handler = {
-	init : func {
-		me.latN = props.globals.getNode("/sim/viewer/latitude-deg", 1);
-		me.lonN = props.globals.getNode("/sim/viewer/longitude-deg", 1);
-		me.altN = props.globals.getNode("/sim/viewer/altitude-ft", 1);
-		me.hdgN = props.globals.getNode("/orientation/heading-deg", 1);
-
-		setlistener("/sim/signals/reinit", func(n) { n.getValue() or me.reset() });
-		setlistener("/sim/crashed", func(n) { n.getValue() and me.reset() });
-		setlistener("/sim/freeze/replay-state", func {
-			settimer(func { me.reset() }, 1); # time for replay to catch up
-		});
-		me.reset();
-	},
-	start : func {
-		me.reset();
-	},
-	reset: func {
-		me.chase = -getprop("/sim/chase-distance-m");
-		me.course = me.hdgN.getValue();
-		me.last = geo.aircraft_position();
-		me.setpos(1);
-		me.dist = 20;
-	},
-	setpos : func(force = 0) {
-		var pos = geo.aircraft_position();
-
-		# check if the aircraft has moved enough
-		var dist = me.last.distance_to(pos);
-		if (dist < 1.7 * me.chase and !force)
-			return 1.13;
-
-		# "predict" and remember next aircraft position
-		var course = me.hdgN.getValue();
-		var delta_alt = (pos.alt() - me.last.alt()) * 0.5;
-		pos.apply_course_distance(course, dist * 0.8);
-		pos.set_alt(pos.alt() + delta_alt);
-		me.last.set(pos);
-
-		# apply random deviation
-		var radius = me.chase * (0.5 * rand() + 0.7);
-		var agl = getprop("/position/altitude-agl-ft") * FT2M;
-		if (agl > me.chase)
-			var angle = rand() * 2 * math.pi;
-		else
-			var angle = ((2 * rand() - 1) * 0.15 + 0.5) * (rand() < 0.5 ? -math.pi : math.pi);
-
-		var dev_alt = math.cos(angle) * radius;
-		var dev_side = math.sin(angle) * radius;
-		pos.apply_course_distance(course + 90, dev_side);
-
-		# and make sure it's not under ground
-		var lat = pos.lat();
-		var lon = pos.lon();
-		var alt = pos.alt();
-		var elev = geo.elevation(lat, lon);
-		if (elev != nil) {
-			elev += 2;   # min elevation
-			if (alt + dev_alt < elev and dev_alt < 0)
-				dev_alt = -dev_alt;
-			if (alt + dev_alt < elev)
-				alt = elev;
-			else
-				alt += dev_alt;
-		}
-
-		# set new view point
-		me.latN.setValue(lat);
-		me.lonN.setValue(lon);
-		me.altN.setValue(alt * M2FT);
-		return 7.3;
-	},
-	update : func {
-		return me.setpos();
-	},
-};
-
-
-var model_view_handler = {
-	init: func(node) {
-		me.viewN = node;
-		me.current = nil;
-		me.legendN = props.globals.initNode("/sim/current-view/model-view", "");
-		me.dialog = props.Node.new({ "dialog-name": "model-view" });
-	},
-	start: func {
-		me.listener = setlistener("/sim/signals/multiplayer-updated", func me._update_(), 1);
-		me.reset();
-		fgcommand("dialog-show", me.dialog);
-	},
-	stop: func {
-		fgcommand("dialog-close", me.dialog);
-		removelistener(me.listener);
-	},
-	reset: func {
-		me.select(0);
-	},
-	find: func(callsign) {
-		forindex (var i; me.list)
-			if (me.list[i].callsign == callsign)
-				return i;
-		return nil;
-	},
-	select: func(which) {
-		if (num(which) == nil)
-			which = me.find(which) or 0;  # turn callsign into index
-
-		me.setup(me.list[which]);
-	},
-	next: func(step) {
-		var i = me.find(me.current);
-		i = i == nil ? 0 : math.mod(i + step, size(me.list));
-		me.setup(me.list[i]);
-	},
-	_update_: func {
-		var self = { callsign: getprop("/sim/multiplay/callsign"), model:,
-				node: props.globals, root: '/' };
-		me.list = [self] ~ multiplayer.model.list;
-		if (!me.find(me.current))
-			me.select(0);
-	},
-	setup: func(data) {
-		if (data.root == '/') {
-			var zoffset = getprop("/sim/chase-distance-m");
-			var ident = '[' ~ data.callsign ~ ']';
-		} else {
-			var zoffset = 70;
-			var ident = '"' ~ data.callsign ~ '" (' ~ data.model ~ ')';
-		}
-
-		me.current = data.callsign;
-		me.legendN.setValue(ident);
-		setprop("/sim/current-view/z-offset-m", zoffset);
-
-		me.viewN.getNode("config").setValues({
-			"eye-lat-deg-path": data.root ~ "/position/latitude-deg",
-			"eye-lon-deg-path": data.root ~ "/position/longitude-deg",
-			"eye-alt-ft-path": data.root ~ "/position/altitude-ft",
-			"eye-heading-deg-path": data.root ~ "/orientation/heading-deg",
-			"target-lat-deg-path": data.root ~ "/position/latitude-deg",
-			"target-lon-deg-path": data.root ~ "/position/longitude-deg",
-			"target-alt-ft-path": data.root ~ "/position/altitude-ft",
-			"target-heading-deg-path": data.root ~ "/orientation/heading-deg",
-			"target-pitch-deg-path": data.root ~ "/orientation/pitch-deg",
-			"target-roll-deg-path": data.root ~ "/orientation/roll-deg",
-		});
-	},
-};
-
-
-var pilot_view_limiter = {
-	new : func {
-		return { parents: [pilot_view_limiter] };
-	},
-	init : func {
-		me.hdgN = props.globals.getNode("/sim/current-view/heading-offset-deg");
-		me.xoffsetN = props.globals.getNode("/sim/current-view/x-offset-m");
-		me.xoffset_lowpass = aircraft.lowpass.new(0.1);
-		me.last_offset = 0;
-	},
-	start : func {
-		var limits = current.getNode("config/limits", 1);
-		me.left = {
-			heading_max : abs(limits.getNode("left/heading-max-deg", 1).getValue() or 1000),
-			threshold : abs(limits.getNode("left/x-offset-threshold-deg", 1).getValue() or 0),
-			xoffset_max : abs(limits.getNode("left/x-offset-max-m", 1).getValue() or 0),
-		};
-		me.right = {
-			heading_max : -abs(limits.getNode("right/heading-max-deg", 1).getValue() or 1000),
-			threshold : -abs(limits.getNode("right/x-offset-threshold-deg", 1).getValue() or 0),
-			xoffset_max : -abs(limits.getNode("right/x-offset-max-m", 1).getValue() or 0),
-		};
-		me.left.scale = me.left.xoffset_max / (me.left.heading_max - me.left.threshold);
-		me.right.scale = me.right.xoffset_max / (me.right.heading_max - me.right.threshold);
-		me.last_hdg = normdeg(me.hdgN.getValue());
-		me.enable_xoffset = me.right.xoffset_max > 0.001 or me.left.xoffset_max > 0.001;
-	},
-	update : func {
-		if (getprop("/devices/status/keyboard/ctrl"))
-			return;
-
-		var hdg = normdeg(me.hdgN.getValue());
-		if (abs(me.last_hdg - hdg) > 180)  # avoid wrap-around skips
-			me.hdgN.setDoubleValue(hdg = me.last_hdg);
-		elsif (hdg > me.left.heading_max)
-			me.hdgN.setDoubleValue(hdg = me.left.heading_max);
-		elsif (hdg < me.right.heading_max)
-			me.hdgN.setDoubleValue(hdg = me.right.heading_max);
-		me.last_hdg = hdg;
-
-		# translate view on X axis to look far right or far left
-		if (me.enable_xoffset) {
-			var offset = 0;
-			if (hdg > me.left.threshold)
-				offset = (me.left.threshold - hdg) * me.left.scale;
-			elsif (hdg < me.right.threshold)
-				offset = (me.right.threshold - hdg) * me.right.scale;
-
-			var new_offset = me.xoffset_lowpass.filter(offset);
-			me.xoffsetN.setDoubleValue(me.xoffsetN.getValue() - me.last_offset + new_offset);
-			me.last_offset = new_offset;
-		}
-		return 0;
-	},
-};
-
-
-var panViewDir = func(step) {	# FIXME overrides panViewDir function from above; needs better integration
-	if (getprop("/sim/freeze/master"))
-		var prop = "/sim/current-view/heading-offset-deg";
-	else
-		var prop = "/sim/current-view/goal-heading-offset-deg";
-	var viewVal = getprop(prop);
-	var delta = step * VIEW_PAN_RATE * getprop("/sim/time/delta-realtime-sec");
-	var viewValSlew = normdeg(viewVal + delta);
-	var headingMax = abs(current.getNode("config/limits/left/heading-max-deg", 1).getValue() or 1000);
-	var headingMin = -abs(current.getNode("config/limits/right/heading-max-deg", 1).getValue() or 1000);
-	if (viewValSlew > headingMax)
-		viewValSlew = headingMax;
-	elsif (viewValSlew < headingMin)
-		viewValSlew = headingMin;
-	setprop(prop, viewValSlew);
-}
-
-
-#------------------------------------------------------------------------------
-#
-# Saves/restores/moves the view point (position, orientation, field-of-view).
-# Moves are interpolated with sinusoidal characteristic. There's only one
-# instance of this class, available as "view.point".
-#
-# Usage:
-#    view.point.save();        ... save current view and return reference to
-#                                  saved values in the form of a props.Node
-#
-#    view.point.restore();     ... restore saved view parameters
-#
-#    view.point.move(<prop> [, <time>]);
-#                              ... set view parameters from a props.Node with
-#                                  optional move time in seconds. <prop> may be
-#                                  nil, in which case nothing happens.
-#
-# A parameter set as expected by set() and returned by save() is a props.Node
-# object containing any (or none) of these children:
-#
-#   <heading-offset-deg>
-#   <pitch-offset-deg>
-#   <roll-offset-deg>
-#   <x-offset-m>
-#   <y-offset-m>
-#   <z-offset-m>
-#   <field-of-view>
-#   <move-time-sec>
-#
-# The <move-time> isn't really a property of the view, but is available
-# for convenience. The time argument in the move() method overrides it.
-
-
-##
-# Normalize angle to  -180 <= angle < 180
-#
-var normdeg = func(a) {
-	while (a >= 180)
-		a -= 360;
-	while (a < -180)
-		a += 360;
-	return a;
-}
-
-
-##
-# Manages one translation/rotation axis. (For simplicity reasons the
-# field-of-view parameter is also managed by this class.)
-#
-var ViewAxis = {
-	new : func(prop) {
-		var m = { parents : [ViewAxis] };
-		m.prop = props.globals.getNode(prop, 1);
-		if (m.prop.getType() == "NONE")
-			m.prop.setDoubleValue(0);
-
-		m.from = m.to = m.prop.getValue();
-		return m;
-	},
-	reset : func {
-		me.from = me.to = normdeg(me.prop.getValue());
-	},
-	target : func(v) {
-		me.to = normdeg(v);
-	},
-	move : func(blend) {
-		me.prop.setValue(me.from + blend * (me.to - me.from));
-	},
-};
-
-
-
-##
-# view.point: handles smooth view movements
-#
-var point = {
-	init : func {
-		me.axes = {
-			"heading-offset-deg" : ViewAxis.new("/sim/current-view/goal-heading-offset-deg"),
-			"pitch-offset-deg" : ViewAxis.new("/sim/current-view/goal-pitch-offset-deg"),
-			"roll-offset-deg" : ViewAxis.new("/sim/current-view/goal-roll-offset-deg"),
-			"x-offset-m" : ViewAxis.new("/sim/current-view/x-offset-m"),
-			"y-offset-m" : ViewAxis.new("/sim/current-view/y-offset-m"),
-			"z-offset-m" : ViewAxis.new("/sim/current-view/z-offset-m"),
-			"field-of-view" : ViewAxis.new("/sim/current-view/field-of-view"),
-		};
-		me.storeN = props.Node.new();
-		me.dtN = props.globals.getNode("/sim/time/delta-realtime-sec", 1);
-		me.currviewN = props.globals.getNode("/sim/current-view", 1);
-		me.blend = 0;
-		me.loop_id = 0;
-		props.copy(props.globals.getNode("/sim/view/config"), me.storeN);
-	},
-	save : func {
-		me.storeN = props.Node.new();
-		props.copy(me.currviewN, me.storeN);
-		return me.storeN;
-	},
-	restore : func {
-		me.move(me.storeN);
-	},
-	move : func(prop, time = nil) {
-		prop != nil or return;
-		foreach (var a; keys(me.axes)) {
-			var n = prop.getNode(a);
-			me.axes[a].reset();
-			if (n != nil)
-				me.axes[a].target(n.getValue());
-		}
-		var m = prop.getNode("move-time-sec");
-		if (m != nil)
-			time = m.getValue();
-
-		if (time == nil)
-			time = 1;
-
-		me.blend = -1;   # range -1 .. 1
-		me._loop_(me.loop_id += 1, time);
-	},
-	_loop_ : func(id, time) {
-		me.loop_id == id or return;
-		me.blend += me.dtN.getValue() / time;
-		if (me.blend > 1)
-			me.blend = 1;
-
-		var b = (math.sin(me.blend * math.pi / 2) + 1) / 2; # range 0 .. 1
-		foreach (var a; keys(me.axes))
-			me.axes[a].move(b);
-
-		if (me.blend < 1)
-			settimer(func { me._loop_(id, time) }, 0);
-	},
-};
-
-
-
-var fovProp = nil;
-
-
-_setlistener("/sim/signals/nasal-dir-initialized", func {
-	views = props.globals.getNode("/sim").getChildren("view");
-	fovProp = props.globals.getNode("/sim/current-view/field-of-view");
-	point.init();
-
-	setlistener("/sim/current-view/view-number", func(n) {
-		current = views[index = n.getValue()];
-	}, 1);
-
-	props.globals.initNode("/position/altitude-agl-ft"); # needed by Fly-By View
-	manager.init();
-	manager.register("Fly-By View", fly_by_view_handler);
-	manager.register("Model View", model_view_handler);
-});
-
-
-_setlistener("/sim/signals/fdm-initialized", func {
-	var zoffset = nil;
-	foreach (var v; views) {
-		var index = v.getIndex();
-		if (index > 7 and index < 100) {
-			globals["view"] = nil;
-			die("\n***\n*\n*  Illegal use of reserved view index "
-					~ index ~ ". Use indices >= 100!\n*\n***");
-		} elsif (index >= 100 and index < 200) {
-			if (v.getNode("name") == nil)
-				continue;
-			var e = v.getNode("enabled");
-			if (e != nil) {
-				aircraft.data.add(e);
-				e.setAttribute("userarchive", 0);
-			}
-		}
-	}
-
-	forindex (var i; views) {
-		var limits = views[i].getNode("config/limits/enabled");
-		if (limits != nil) {
-			func (i) {
-				var limiter = pilot_view_limiter.new();
-				setlistener(limits, func(n) {
-					manager.register(i, n.getBoolValue() ? limiter : nil);
-					manager.set_view();
-				}, 1);
-			}(i);
-		}
-	}
-});
-
-
+##
+## view.nas
+##
+##  Nasal code for implementing view-specific functionality.
+
+var index = nil;    # current view index
+var views = nil;    # list of all view branches (/sim/view[n]) as props.Node
+var current = nil;  # current view branch (e.g. /sim/view[1]) as props.Node
+
+
+var hasmember = func(class, member) {
+	if (contains(class, member))
+		return 1;
+	if (!contains(class, "parents"))
+		return 0;
+	if (typeof(class.parents) != "vector")
+		return 0;
+	foreach (var parent; class.parents)
+		if (hasmember(parent, member))
+			return 1;
+	return 0;
+}
+
+
+# Dynamically calculate limits so that it takes STEPS iterations to
+# traverse the whole range, the maximum FOV is fixed at 120 degrees,
+# and the minimum corresponds to normal maximum human visual acuity
+# (~1 arc minute of resolution, although apparently people vary widely
+# in this ability).  Quick derivation of the math:
+#
+#   mul^steps = max/min
+#   steps * ln(mul) = ln(max/min)
+#   mul = exp(ln(max/min) / steps)
+var STEPS = 40;
+var ACUITY = 1/60; # Maximum angle subtended by one pixel (== 1 arc minute)
+var max = var min = var mul = 0;
+var calcMul = func {
+    max = 120; # Fixed at 120 degrees
+    min = getprop("/sim/startup/xsize") * ACUITY;
+    mul = math.exp(math.ln(max/min) / STEPS);
+}
+
+##
+# Handler.  Increase FOV by one step
+#
+var increase = func {
+    calcMul();
+    var val = fovProp.getValue() * mul;
+    if(val == max) { return; }
+    if(val > max) { val = max }
+    fovProp.setDoubleValue(val);
+    var popup=getprop("/sim/view-name-popup");
+    if(popup == 1 or popup==nil) gui.popupTip(sprintf("FOV: %.1f", val));
+}
+
+##
+# Handler.  Decrease FOV by one step
+#
+var decrease = func {
+    calcMul();
+    var val = fovProp.getValue() / mul;
+    fovProp.setDoubleValue(val);
+    var popup=getprop("/sim/view-name-popup");
+    if(popup == 1 or popup==nil) gui.popupTip(sprintf("FOV: %.1f%s", val, val < min ? " (overzoom)" : ""));
+}
+
+##
+# Handler.  Reset FOV to default.
+#
+var resetFOV = func {
+    setprop("/sim/current-view/field-of-view",
+            getprop("/sim/current-view/config/default-field-of-view-deg"));
+}
+
+var resetViewPos = func {
+    var v = current.getNode("config");
+    setprop("/sim/current-view/x-offset-m", v.getNode("x-offset-m", 1).getValue() or 0);
+    setprop("/sim/current-view/y-offset-m", v.getNode("y-offset-m", 1).getValue() or 0);
+    setprop("/sim/current-view/z-offset-m", v.getNode("z-offset-m", 1).getValue() or 0);
+}
+
+var resetViewDir = func {
+    setprop("/sim/current-view/goal-heading-offset-deg",
+            getprop("/sim/current-view/config/heading-offset-deg"));
+    setprop("/sim/current-view/goal-pitch-offset-deg",
+            getprop("/sim/current-view/config/pitch-offset-deg"));
+    setprop("/sim/current-view/goal-roll-offset-deg",
+            getprop("/sim/current-view/config/roll-offset-deg"));
+}
+
+##
+# Handler.  Step to the next (force=1) or next enabled view.
+#
+var stepView = func(step, force = 0) {
+    step = step > 0 ? 1 : -1;
+    var n = index;
+    for (var i = 0; i < size(views); i += 1) {
+        n += step;
+        if (n < 0)
+            n = size(views) - 1;
+        elsif (n >= size(views))
+            n = 0;
+        if (force or (var e = views[n].getNode("enabled")) == nil or e.getBoolValue())
+            break;
+    }
+    setprop("/sim/current-view/view-number", n);
+
+    # And pop up a nice reminder
+    var popup=getprop("/sim/view-name-popup");
+    if(popup == 1 or popup==nil) gui.popupTip(views[n].getNode("name").getValue());
+}
+
+##
+# Get view index by name.
+#
+var indexof = func(name) {
+    forindex (var i; views)
+        if (views[i].getNode("name", 1).getValue() == name)
+            return i;
+    return nil;
+}
+
+##
+# Standard view "slew" rate, in degrees/sec.
+#
+var VIEW_PAN_RATE = 60;
+
+##
+# Pans the view horizontally.  The argument specifies a relative rate
+# (or number of "steps" -- same thing) to the standard rate.
+#
+var panViewDir = func(step) {
+    if (getprop("/sim/freeze/master"))
+        var prop = "/sim/current-view/heading-offset-deg";
+    else
+        var prop = "/sim/current-view/goal-heading-offset-deg";
+
+    controls.slewProp(prop, step * VIEW_PAN_RATE);
+}
+
+##
+# Pans the view vertically.  The argument specifies a relative rate
+# (or number of "steps" -- same thing) to the standard rate.
+#
+var panViewPitch = func(step) {
+    if (getprop("/sim/freeze/master"))
+        var prop = "/sim/current-view/pitch-offset-deg";
+    else
+        var prop = "/sim/current-view/goal-pitch-offset-deg";
+
+    controls.slewProp(prop, step * VIEW_PAN_RATE);
+}
+
+
+##
+# Reset view to default using current view manager (see default_handler).
+#
+var resetView = func {
+	manager.reset();
+}
+
+
+##
+# Default view handler used by view.manager.
+#
+var default_handler = {
+	reset : func {
+		resetViewDir();
+		resetFOV();
+	},
+};
+
+
+##
+# View manager. Administrates optional Nasal view handlers.
+# Usage:  view.manager.register(<view-id>, <view-handler>);
+#
+#   view-id:      the view's name (e.g. "Chase View") or index number
+#   view-handler: a hash with any combination of the functions listed in the
+#                 following example, or none at all. Only define the interface
+#                 functions that you really need! The hash may contain local
+#                 variables and other, non-interface functions.
+#
+# Example:
+#
+#   var some_view_handler = {
+#           init   : func {},    # called only once at startup
+#           start  : func {},    # called when view is switched to our view
+#           stop   : func {},    # called when view is switched away from our view
+#           reset  : func {},    # called with view.resetView()
+#           update : func { 0 }, # called iteratively if defined. Must return
+#   };                           # interval in seconds until next invocation
+#                                # Don't define it if you don't need it!
+#
+#   view.manager.register("Some View", some_view_handler);
+#
+#
+var manager = {
+	current : { node: nil, handler: default_handler },
+	init : func {
+		me.views = {};
+		me.loopid = 0;
+		var viewnodes = props.globals.getNode("sim").getChildren("view");
+		forindex (var i; viewnodes)
+			me.views[i] = { node: viewnodes[i], handler: default_handler };
+		setlistener("/sim/current-view/view-number", func(n) {
+			manager.set_view(n.getValue());
+		}, 1);
+	},
+	register : func(which, handler = nil) {
+		if (num(which) == nil)
+			which = indexof(which);
+		if (handler == nil)
+			handler = default_handler;
+		me.views[which]["handler"] = handler;
+		if (hasmember(handler, "init"))
+			handler.init(me.views[which].node);
+		me.set_view();
+	},
+	set_view : func(which = nil) {
+		if (which == nil)
+			which = index;
+		elsif (num(which) == nil)
+			which = indexof(which);
+
+		me.loopid += 1;
+		if (hasmember(me.current.handler, "stop"))
+			me.current.handler.stop();
+
+		me.current = me.views[which];
+
+		if (hasmember(me.current.handler, "start"))
+			me.current.handler.start();
+		if (hasmember(me.current.handler, "update"))
+			me._loop_(me.loopid += 1);
+	},
+	reset : func {
+		if (hasmember(me.current.handler, "reset"))
+			me.current.handler.reset();
+		else
+			default_handler.reset();
+	},
+	_loop_ : func(id) {
+		id == me.loopid or return;
+		settimer(func { me._loop_(id) }, me.current.handler.update() or 0);
+	},
+};
+
+
+var fly_by_view_handler = {
+	init : func {
+		me.latN = props.globals.getNode("/sim/viewer/latitude-deg", 1);
+		me.lonN = props.globals.getNode("/sim/viewer/longitude-deg", 1);
+		me.altN = props.globals.getNode("/sim/viewer/altitude-ft", 1);
+		me.hdgN = props.globals.getNode("/orientation/heading-deg", 1);
+
+		setlistener("/sim/signals/reinit", func(n) { n.getValue() or me.reset() });
+		setlistener("/sim/crashed", func(n) { n.getValue() and me.reset() });
+		setlistener("/sim/freeze/replay-state", func {
+			settimer(func { me.reset() }, 1); # time for replay to catch up
+		});
+		me.reset();
+	},
+	start : func {
+		me.reset();
+	},
+	reset: func {
+		me.chase = -getprop("/sim/chase-distance-m");
+		me.course = me.hdgN.getValue();
+		me.last = geo.aircraft_position();
+		me.setpos(1);
+		me.dist = 20;
+	},
+	setpos : func(force = 0) {
+		var pos = geo.aircraft_position();
+
+		# check if the aircraft has moved enough
+		var dist = me.last.distance_to(pos);
+		if (dist < 1.7 * me.chase and !force)
+			return 1.13;
+
+		# "predict" and remember next aircraft position
+		var course = me.hdgN.getValue();
+		var delta_alt = (pos.alt() - me.last.alt()) * 0.5;
+		pos.apply_course_distance(course, dist * 0.8);
+		pos.set_alt(pos.alt() + delta_alt);
+		me.last.set(pos);
+
+		# apply random deviation
+		var radius = me.chase * (0.5 * rand() + 0.7);
+		var agl = getprop("/position/altitude-agl-ft") * FT2M;
+		if (agl > me.chase)
+			var angle = rand() * 2 * math.pi;
+		else
+			var angle = ((2 * rand() - 1) * 0.15 + 0.5) * (rand() < 0.5 ? -math.pi : math.pi);
+
+		var dev_alt = math.cos(angle) * radius;
+		var dev_side = math.sin(angle) * radius;
+		pos.apply_course_distance(course + 90, dev_side);
+
+		# and make sure it's not under ground
+		var lat = pos.lat();
+		var lon = pos.lon();
+		var alt = pos.alt();
+		var elev = geo.elevation(lat, lon);
+		if (elev != nil) {
+			elev += 2;   # min elevation
+			if (alt + dev_alt < elev and dev_alt < 0)
+				dev_alt = -dev_alt;
+			if (alt + dev_alt < elev)
+				alt = elev;
+			else
+				alt += dev_alt;
+		}
+
+		# set new view point
+		me.latN.setValue(lat);
+		me.lonN.setValue(lon);
+		me.altN.setValue(alt * M2FT);
+		return 7.3;
+	},
+	update : func {
+		return me.setpos();
+	},
+};
+
+
+var model_view_handler = {
+	init: func(node) {
+		me.viewN = node;
+		me.current = nil;
+		me.legendN = props.globals.initNode("/sim/current-view/model-view", "");
+		me.dialog = props.Node.new({ "dialog-name": "model-view" });
+	},
+	start: func {
+		me.listener = setlistener("/sim/signals/multiplayer-updated", func me._update_(), 1);
+		me.reset();
+		fgcommand("dialog-show", me.dialog);
+	},
+	stop: func {
+		fgcommand("dialog-close", me.dialog);
+		removelistener(me.listener);
+	},
+	reset: func {
+		me.select(0);
+	},
+	find: func(callsign) {
+		forindex (var i; me.list)
+			if (me.list[i].callsign == callsign)
+				return i;
+		return nil;
+	},
+	select: func(which) {
+		if (num(which) == nil)
+			which = me.find(which) or 0;  # turn callsign into index
+
+		me.setup(me.list[which]);
+	},
+	next: func(step) {
+		var i = me.find(me.current);
+		i = i == nil ? 0 : math.mod(i + step, size(me.list));
+		me.setup(me.list[i]);
+	},
+	_update_: func {
+		var self = { callsign: getprop("/sim/multiplay/callsign"), model:,
+				node: props.globals, root: '/' };
+		me.list = [self] ~ multiplayer.model.list;
+		if (!me.find(me.current))
+			me.select(0);
+	},
+	setup: func(data) {
+		if (data.root == '/') {
+			var zoffset = getprop("/sim/chase-distance-m");
+			var ident = '[' ~ data.callsign ~ ']';
+		} else {
+			var zoffset = 70;
+			var ident = '"' ~ data.callsign ~ '" (' ~ data.model ~ ')';
+		}
+
+		me.current = data.callsign;
+		me.legendN.setValue(ident);
+		setprop("/sim/current-view/z-offset-m", zoffset);
+
+		me.viewN.getNode("config").setValues({
+			"eye-lat-deg-path": data.root ~ "/position/latitude-deg",
+			"eye-lon-deg-path": data.root ~ "/position/longitude-deg",
+			"eye-alt-ft-path": data.root ~ "/position/altitude-ft",
+			"eye-heading-deg-path": data.root ~ "/orientation/heading-deg",
+			"target-lat-deg-path": data.root ~ "/position/latitude-deg",
+			"target-lon-deg-path": data.root ~ "/position/longitude-deg",
+			"target-alt-ft-path": data.root ~ "/position/altitude-ft",
+			"target-heading-deg-path": data.root ~ "/orientation/heading-deg",
+			"target-pitch-deg-path": data.root ~ "/orientation/pitch-deg",
+			"target-roll-deg-path": data.root ~ "/orientation/roll-deg",
+		});
+	},
+};
+
+
+var pilot_view_limiter = {
+	new : func {
+		return { parents: [pilot_view_limiter] };
+	},
+	init : func {
+		me.hdgN = props.globals.getNode("/sim/current-view/heading-offset-deg");
+		me.xoffsetN = props.globals.getNode("/sim/current-view/x-offset-m");
+		me.xoffset_lowpass = aircraft.lowpass.new(0.1);
+		me.last_offset = 0;
+	},
+	start : func {
+		var limits = current.getNode("config/limits", 1);
+		me.left = {
+			heading_max : abs(limits.getNode("left/heading-max-deg", 1).getValue() or 1000),
+			threshold : abs(limits.getNode("left/x-offset-threshold-deg", 1).getValue() or 0),
+			xoffset_max : abs(limits.getNode("left/x-offset-max-m", 1).getValue() or 0),
+		};
+		me.right = {
+			heading_max : -abs(limits.getNode("right/heading-max-deg", 1).getValue() or 1000),
+			threshold : -abs(limits.getNode("right/x-offset-threshold-deg", 1).getValue() or 0),
+			xoffset_max : -abs(limits.getNode("right/x-offset-max-m", 1).getValue() or 0),
+		};
+		me.left.scale = me.left.xoffset_max / (me.left.heading_max - me.left.threshold);
+		me.right.scale = me.right.xoffset_max / (me.right.heading_max - me.right.threshold);
+		me.last_hdg = normdeg(me.hdgN.getValue());
+		me.enable_xoffset = me.right.xoffset_max > 0.001 or me.left.xoffset_max > 0.001;
+	},
+	update : func {
+		if (getprop("/devices/status/keyboard/ctrl"))
+			return;
+
+		var hdg = normdeg(me.hdgN.getValue());
+		if (abs(me.last_hdg - hdg) > 180)  # avoid wrap-around skips
+			me.hdgN.setDoubleValue(hdg = me.last_hdg);
+		elsif (hdg > me.left.heading_max)
+			me.hdgN.setDoubleValue(hdg = me.left.heading_max);
+		elsif (hdg < me.right.heading_max)
+			me.hdgN.setDoubleValue(hdg = me.right.heading_max);
+		me.last_hdg = hdg;
+
+		# translate view on X axis to look far right or far left
+		if (me.enable_xoffset) {
+			var offset = 0;
+			if (hdg > me.left.threshold)
+				offset = (me.left.threshold - hdg) * me.left.scale;
+			elsif (hdg < me.right.threshold)
+				offset = (me.right.threshold - hdg) * me.right.scale;
+
+			var new_offset = me.xoffset_lowpass.filter(offset);
+			me.xoffsetN.setDoubleValue(me.xoffsetN.getValue() - me.last_offset + new_offset);
+			me.last_offset = new_offset;
+		}
+		return 0;
+	},
+};
+
+
+var panViewDir = func(step) {	# FIXME overrides panViewDir function from above; needs better integration
+	if (getprop("/sim/freeze/master"))
+		var prop = "/sim/current-view/heading-offset-deg";
+	else
+		var prop = "/sim/current-view/goal-heading-offset-deg";
+	var viewVal = getprop(prop);
+	var delta = step * VIEW_PAN_RATE * getprop("/sim/time/delta-realtime-sec");
+	var viewValSlew = normdeg(viewVal + delta);
+	var headingMax = abs(current.getNode("config/limits/left/heading-max-deg", 1).getValue() or 1000);
+	var headingMin = -abs(current.getNode("config/limits/right/heading-max-deg", 1).getValue() or 1000);
+	if (viewValSlew > headingMax)
+		viewValSlew = headingMax;
+	elsif (viewValSlew < headingMin)
+		viewValSlew = headingMin;
+	setprop(prop, viewValSlew);
+}
+
+
+#------------------------------------------------------------------------------
+#
+# Saves/restores/moves the view point (position, orientation, field-of-view).
+# Moves are interpolated with sinusoidal characteristic. There's only one
+# instance of this class, available as "view.point".
+#
+# Usage:
+#    view.point.save();        ... save current view and return reference to
+#                                  saved values in the form of a props.Node
+#
+#    view.point.restore();     ... restore saved view parameters
+#
+#    view.point.move(<prop> [, <time>]);
+#                              ... set view parameters from a props.Node with
+#                                  optional move time in seconds. <prop> may be
+#                                  nil, in which case nothing happens.
+#
+# A parameter set as expected by set() and returned by save() is a props.Node
+# object containing any (or none) of these children:
+#
+#   <heading-offset-deg>
+#   <pitch-offset-deg>
+#   <roll-offset-deg>
+#   <x-offset-m>
+#   <y-offset-m>
+#   <z-offset-m>
+#   <field-of-view>
+#   <move-time-sec>
+#
+# The <move-time> isn't really a property of the view, but is available
+# for convenience. The time argument in the move() method overrides it.
+
+
+##
+# Normalize angle to  -180 <= angle < 180
+#
+var normdeg = func(a) {
+	while (a >= 180)
+		a -= 360;
+	while (a < -180)
+		a += 360;
+	return a;
+}
+
+
+##
+# Manages one translation/rotation axis. (For simplicity reasons the
+# field-of-view parameter is also managed by this class.)
+#
+var ViewAxis = {
+	new : func(prop) {
+		var m = { parents : [ViewAxis] };
+		m.prop = props.globals.getNode(prop, 1);
+		if (m.prop.getType() == "NONE")
+			m.prop.setDoubleValue(0);
+
+		m.from = m.to = m.prop.getValue();
+		return m;
+	},
+	reset : func {
+		me.from = me.to = normdeg(me.prop.getValue());
+	},
+	target : func(v) {
+		me.to = normdeg(v);
+	},
+	move : func(blend) {
+		me.prop.setValue(me.from + blend * (me.to - me.from));
+	},
+};
+
+
+
+##
+# view.point: handles smooth view movements
+#
+var point = {
+	init : func {
+		me.axes = {
+			"heading-offset-deg" : ViewAxis.new("/sim/current-view/goal-heading-offset-deg"),
+			"pitch-offset-deg" : ViewAxis.new("/sim/current-view/goal-pitch-offset-deg"),
+			"roll-offset-deg" : ViewAxis.new("/sim/current-view/goal-roll-offset-deg"),
+			"x-offset-m" : ViewAxis.new("/sim/current-view/x-offset-m"),
+			"y-offset-m" : ViewAxis.new("/sim/current-view/y-offset-m"),
+			"z-offset-m" : ViewAxis.new("/sim/current-view/z-offset-m"),
+			"field-of-view" : ViewAxis.new("/sim/current-view/field-of-view"),
+		};
+		me.storeN = props.Node.new();
+		me.dtN = props.globals.getNode("/sim/time/delta-realtime-sec", 1);
+		me.currviewN = props.globals.getNode("/sim/current-view", 1);
+		me.blend = 0;
+		me.loop_id = 0;
+		props.copy(props.globals.getNode("/sim/view/config"), me.storeN);
+	},
+	save : func {
+		me.storeN = props.Node.new();
+		props.copy(me.currviewN, me.storeN);
+		return me.storeN;
+	},
+	restore : func {
+		me.move(me.storeN);
+	},
+	move : func(prop, time = nil) {
+		prop != nil or return;
+		foreach (var a; keys(me.axes)) {
+			var n = prop.getNode(a);
+			me.axes[a].reset();
+			if (n != nil)
+				me.axes[a].target(n.getValue());
+		}
+		var m = prop.getNode("move-time-sec");
+		if (m != nil)
+			time = m.getValue();
+
+		if (time == nil)
+			time = 1;
+
+		me.blend = -1;   # range -1 .. 1
+		me._loop_(me.loop_id += 1, time);
+	},
+	_loop_ : func(id, time) {
+		me.loop_id == id or return;
+		me.blend += me.dtN.getValue() / time;
+		if (me.blend > 1)
+			me.blend = 1;
+
+		var b = (math.sin(me.blend * math.pi / 2) + 1) / 2; # range 0 .. 1
+		foreach (var a; keys(me.axes))
+			me.axes[a].move(b);
+
+		if (me.blend < 1)
+			settimer(func { me._loop_(id, time) }, 0);
+	},
+};
+
+
+
+var fovProp = nil;
+
+
+_setlistener("/sim/signals/nasal-dir-initialized", func {
+	views = props.globals.getNode("/sim").getChildren("view");
+	fovProp = props.globals.getNode("/sim/current-view/field-of-view");
+	point.init();
+
+	setlistener("/sim/current-view/view-number", func(n) {
+		current = views[index = n.getValue()];
+	}, 1);
+
+	props.globals.initNode("/position/altitude-agl-ft"); # needed by Fly-By View
+	manager.init();
+	manager.register("Fly-By View", fly_by_view_handler);
+	manager.register("Model View", model_view_handler);
+});
+
+
+_setlistener("/sim/signals/fdm-initialized", func {
+	var zoffset = nil;
+	foreach (var v; views) {
+		var index = v.getIndex();
+		if (index > 7 and index < 100) {
+			globals["view"] = nil;
+			die("\n***\n*\n*  Illegal use of reserved view index "
+					~ index ~ ". Use indices >= 100!\n*\n***");
+		} elsif (index >= 100 and index < 200) {
+			if (v.getNode("name") == nil)
+				continue;
+			var e = v.getNode("enabled");
+			if (e != nil) {
+				aircraft.data.add(e);
+				e.setAttribute("userarchive", 0);
+			}
+		}
+	}
+
+	forindex (var i; views) {
+		var limits = views[i].getNode("config/limits/enabled");
+		if (limits != nil) {
+			func (i) {
+				var limiter = pilot_view_limiter.new();
+				setlistener(limits, func(n) {
+					manager.register(i, n.getBoolValue() ? limiter : nil);
+					manager.set_view();
+				}, 1);
+			}(i);
+		}
+	}
+});
+
+
diff --git a/Shaders/reflect-bump-spec.frag b/Shaders/reflect-bump-spec.frag
new file mode 100644
index 000000000..fcc6d3850
--- /dev/null
+++ b/Shaders/reflect-bump-spec.frag
@@ -0,0 +1,123 @@
+// -*- mode: C; -*-
+// Licence: GPL v2
+// Author: Vivian Meazza. 
+
+#version 120
+
+varying vec4  rawpos;
+varying vec4  ecPosition;
+varying vec3  VNormal;
+varying vec3  VTangent;
+varying vec3  VBinormal;
+varying vec3  Normal;
+varying vec4  constantColor;
+varying vec3  vViewVec;
+varying vec3  reflVec;
+
+varying vec4 Diffuse;
+varying vec3 lightDir, halfVector;
+varying float alpha, fogCoord;
+
+uniform samplerCube Environment;
+uniform sampler2D Rainbow;
+uniform sampler2D BaseTex;
+uniform sampler2D Fresnel;
+uniform sampler2D Map;
+uniform sampler2D NormalTex;
+uniform sampler3D Noise;
+
+uniform float refl_correction;
+uniform float rainbowiness;
+uniform float fresneliness;
+uniform float noisiness;
+uniform float ambient_correction;
+uniform float reflect_map;
+
+void main (void)
+{
+    vec3 halfV;
+    float NdotL, NdotHV;
+    vec4 color = constantColor;
+    vec4 specular = vec4(0.0);
+    vec4 ns = texture2D(NormalTex, gl_TexCoord[0].st);
+    vec3 n = ns.rgb * 2.0 - 1.0;
+    n = normalize(n.x * VTangent + n.y * VBinormal + n.z * VNormal);
+    NdotL = max(0.0, dot(n, lightDir));
+
+    // calculate the specular light
+    if (NdotL > 0.0) {
+        color += Diffuse * NdotL;
+        halfV = normalize(halfVector);
+        NdotHV = max(dot(n, halfV), 0.0);
+        if (gl_FrontMaterial.shininess > 0.0)
+            specular.rgb = (gl_FrontMaterial.specular.rgb * ns.a
+            * gl_LightSource[0].specular.rgb
+            * pow(NdotHV, gl_FrontMaterial.shininess));
+    }
+
+    color.a = alpha;
+    color = clamp(color, 0.0, 1.0);
+    vec4 texel = texture2D(BaseTex, gl_TexCoord[0].st);
+    vec4 texelcolor = color * texel + specular;
+
+    // calculate the fog factor
+    float fogCoord = ecPosition.z;
+    const float LOG2 = 1.442695;
+    float fogFactor = exp2(-gl_Fog.density * gl_Fog.density * fogCoord * fogCoord * LOG2);
+    fogFactor = clamp(fogFactor, 0.0, 1.0);
+
+    if(gl_Fog.density == 1.0)
+        fogFactor=1.0;
+
+    vec3 normal = normalize(VNormal);
+    vec3 viewVec = normalize(vViewVec);
+
+    // Map a rainbowish color
+    float v = dot(viewVec, normal);
+    vec4 rainbow = texture2D(Rainbow, vec2(v, 0.0));
+
+    // Map a fresnel effect
+    vec4 fresnel = texture2D(Fresnel, vec2(v, 0.0));
+
+    // map the refection of the environment
+    vec4 reflection = textureCube(Environment, reflVec);
+
+    // set the user shininess offse
+    float transparency_offset = clamp(refl_correction, -1.0, 1.0);
+    float reflFactor = 0.0;
+
+    if(reflect_map > 0){
+        // map the shininess of the object with user input 
+        vec4 map = texture2D(Map, gl_TexCoord[0].st);
+        //float pam = (map.a * -2) + 1; //reverse map
+        reflFactor = map.a + transparency_offset;
+    } else {
+        // set the reflectivity proportional to shininess with user 
+        // input 
+        reflFactor = (gl_FrontMaterial.shininess / 128) + transparency_offset;
+    }
+
+    reflFactor = clamp(reflFactor, 0.0, 1.0);
+
+    // set ambient adjustment to remove bluiness with user input
+    float ambient_offset = clamp(ambient_correction, -1.0, 1.0);
+    vec4 ambient_Correction = vec4(gl_LightSource[0].ambient.rg, gl_LightSource[0].ambient.b * 0.6, 0.5) * ambient_offset ;
+    ambient_Correction = clamp(ambient_Correction, -1.0, 1.0);
+
+    // map noise vectore
+    vec4 noisevec = texture3D(Noise, rawpos.xyz);
+
+    // add fringing fresnel and rainbow effects and modulate by reflection
+    vec4 reflcolor = mix(reflection, rainbow, rainbowiness * v);
+    vec4 reflfrescolor = mix(reflcolor, fresnel, fresneliness * v);
+    vec4 noisecolor = mix(reflfrescolor, noisevec, noisiness);
+    vec4 raincolor = vec4(noisecolor.rgb * reflFactor, 1.0);
+
+    vec4 mixedcolor = mix(texel, raincolor, reflFactor);
+
+    // the final reflection
+    vec4 reflColor = color * mixedcolor + specular + ambient_Correction ;
+    reflColor = clamp(reflColor, 0.0, 1.0);
+
+    gl_FragColor = mix(gl_Fog.color, reflColor, fogFactor);
+}
diff --git a/Shaders/reflect-bump-spec.vert b/Shaders/reflect-bump-spec.vert
new file mode 100644
index 000000000..d2b7e9ff2
--- /dev/null
+++ b/Shaders/reflect-bump-spec.vert
@@ -0,0 +1,69 @@
+// -*- mode: C; -*-
+// Licence: GPL v2
+// Author: Vivian Meazza.
+
+varying vec4  rawpos;
+varying vec4  ecPosition;
+varying vec3  VNormal;
+varying vec3  VTangent;
+varying vec3  VBinormal;
+varying vec3  Normal;
+varying vec4  constantColor;
+varying vec3 vViewVec;
+varying vec3 reflVec;
+
+varying vec4 Diffuse;
+varying vec3 normal, lightDir, halfVector;
+varying float alpha, fogCoord;
+
+uniform mat4 osg_ViewMatrixInverse;
+
+attribute vec3 tangent;
+attribute vec3 binormal;
+
+void main(void)
+{
+    rawpos     = gl_Vertex;
+    ecPosition = gl_ModelViewMatrix * gl_Vertex;
+    vec3 ecPosition3 = vec3(gl_ModelViewMatrix * gl_Vertex) / ecPosition.w;
+
+    vec3 t = normalize(cross(gl_Normal, vec3(1.0,0.0,0.0)));
+    vec3 b = normalize(cross(gl_Normal,t));
+    vec3 n = normalize(gl_Normal);
+
+    VNormal = normalize(gl_NormalMatrix * gl_Normal);
+	VTangent = normalize(gl_NormalMatrix * tangent);
+	VBinormal = normalize(gl_NormalMatrix * binormal);
+    Normal = normalize(gl_Normal);
+
+    lightDir = normalize(vec3(gl_LightSource[0].position));
+    halfVector = normalize(gl_LightSource[0].halfVector.xyz);
+    Diffuse = gl_Color * gl_LightSource[0].diffuse;
+    //Diffuse= gl_Color.rgb * max(0.0, dot(normalize(VNormal), gl_LightSource[0].position.xyz));
+    // Super hack: if diffuse material alpha is less than 1, assume a
+    // transparency animation is at work
+    if (gl_FrontMaterial.diffuse.a < 1.0)
+        alpha = gl_FrontMaterial.diffuse.a;
+    else
+        alpha = gl_Color.a;
+
+    fogCoord = abs(ecPosition3.z);
+
+    // Vertex in eye coordinates
+    vec3 vertVec = ecPosition.xyz;
+
+    vViewVec.x = dot(t, vertVec);
+    vViewVec.y = dot(b, vertVec);
+    vViewVec.z = dot(n, vertVec);
+
+    // calculate the reflection vector
+    vec4 reflect_eye = vec4(reflect(vertVec, VNormal), 0.0);
+    reflVec = normalize(gl_ModelViewMatrixInverse * reflect_eye).xyz;
+
+    gl_FrontColor = gl_Color;
+    constantColor = gl_FrontMaterial.emission
+        + gl_Color * (gl_LightModel.ambient + gl_LightSource[0].ambient);
+
+    gl_Position = ftransform();
+    gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
+}
\ No newline at end of file
diff --git a/Shaders/urban.frag b/Shaders/urban.frag
index 1638f94da..7e207cf44 100644
--- a/Shaders/urban.frag
+++ b/Shaders/urban.frag
@@ -1,6 +1,6 @@
 // -*- mode: C; -*-
 // Licence: GPL v2
-// Author: Frederic Bouvier. 
+// Author: Frederic Bouvier.
 //  Adapted from the paper by F. Policarpo et al. : Real-time Relief Mapping on Arbitrary Polygonal Surfaces
 
 #version 120
@@ -34,7 +34,7 @@ float ray_intersect(sampler2D reliefMap, vec2 dp, vec2 ds)
 	for(int i = 0; i < linear_search_steps - 1; ++i)
 	{
 		depth += size;
-		float t = texture2D(reliefMap, dp + ds * depth).a;
+		float t = step(0.95, texture2D(reliefMap, dp + ds * depth).a);
 		if(best_depth > 0.996)
 			if(depth >= t)
 				best_depth = depth;
@@ -46,7 +46,7 @@ float ray_intersect(sampler2D reliefMap, vec2 dp, vec2 ds)
 	for(int i = 0; i < binary_search_steps; ++i)
 	{
 		size *= 0.5;
-		float t = texture2D(reliefMap, dp + ds * depth).a;
+		float t = step(0.95, texture2D(reliefMap, dp + ds * depth).a);
 		if(depth >= t)
 		{
 			best_depth = depth;
@@ -129,7 +129,7 @@ void main (void)
 	finalColor = mix(finalColor, clamp(n+nvL[2]*4.1+vec4(0.1, 0.1, nvL[2]*2.2, 1.0), 0.7, 1.0),
 			step(0.8,Nz)*(1.0-emis)*smoothstep(snowlevel+300.0, snowlevel+360.0, (rawpos.z)+nvL[1]*3000.0));
 	finalColor *= ambient_light;
-	
+
 	if (gl_Fog.density == 1.0)
 		fogFactor=1.0;
 
diff --git a/Shaders/water-orig.frag b/Shaders/water-orig.frag
new file mode 100644
index 000000000..50ae098f8
--- /dev/null
+++ b/Shaders/water-orig.frag
@@ -0,0 +1,86 @@
+#version 120
+
+varying vec4 rawpos;
+varying vec4 ecPosition;
+varying vec3 VNormal;
+varying vec3 Normal;
+varying vec3 lightVec;
+
+uniform sampler3D NoiseTex;
+uniform float osg_SimulationTime;
+
+//const float scale = 1.0;
+
+void main (void)
+{
+    vec4 noisevecS   = texture3D(NoiseTex, (rawpos.xyz)*0.0126);
+    vec4 nvLS   = texture3D(NoiseTex, (rawpos.xyz)*-0.0003323417);
+
+    vec4 noisevec   = texture3D(NoiseTex, (rawpos.xyz)*0.00423+vec3(0.0,0.0,osg_SimulationTime*0.035217));
+    vec4 nvL   = texture3D(NoiseTex, (rawpos.xyz)*0.001223417+(0.0,0.0,osg_SimulationTime*-0.0212));
+
+    float fogFactor;
+    if (gl_Fog.density == 1.0)
+    {
+       fogFactor=1.0;
+    }
+    else
+    {
+        float fogCoord = ecPosition.z;
+        const float LOG2 = 1.442695;
+        fogFactor = exp2(-gl_Fog.density * gl_Fog.density * fogCoord * fogCoord * LOG2);
+        fogFactor = clamp(fogFactor, 0.0, 1.0);
+    }
+
+    float a=1.0;
+    float n=0.00;
+    n += nvLS[0]*a;
+    a/=2.0;
+    n += nvLS[1]*a;
+    a/=2.0;
+    n += nvLS[2]*a;
+    a/=2.0;
+    n += nvLS[3]*a;
+
+    a=4.0;
+    float na=n;
+    na += nvL[0]*1.1;
+    a*=1.2;
+    na += nvL[1]*a;
+    a*=1.2;
+    na += nvL[2]*a;
+    a*=1.2;
+    na += nvL[3]*a;
+    a=2.0;
+    na += noisevec[0]*a*0.2;
+    a*=1.2;
+    na += noisevec[1]*a;
+    a*=1.2;
+    na += noisevec[2]*a;
+    a*=1.2;
+    na += noisevec[3]*a;
+
+    vec4 c1;
+    c1 = asin(vec4(smoothstep(0.0, 2.2, n), smoothstep(-0.1, 2.10, n), smoothstep(-0.2, 2.0, n), 1.0));
+
+    vec3 Eye = normalize(-ecPosition.xyz);
+    vec3 Reflected = normalize(reflect(-normalize(lightVec), normalize(VNormal+vec3(0.0,0.0,na*0.10-0.24)))); 
+
+    vec3 bump = normalize(VNormal+vec3(0.0, 0.0, na)-0.9);
+    vec3 bumped = max(normalize(refract(lightVec, normalize(bump), 0.16)), 0.0);
+
+    vec4 ambientColor = gl_LightSource[0].ambient;
+    vec4 light = ambientColor;
+    c1 *= light;
+
+    float bumpFact = (bumped.r+bumped.g+bumped.b);
+    float ReflectedEye = max(dot(Reflected, Eye), 0.0);
+    float eyeFact = pow(ReflectedEye, 20.0);
+    c1 += 0.3 * gl_LightSource[0].diffuse * (1.0-eyeFact) * bumpFact*bumpFact;
+    c1 += 0.4 * gl_LightSource[0].diffuse * eyeFact * 3*bumpFact;
+    eyeFact = pow(eyeFact, 20.0);
+    c1 += gl_LightSource[0].specular * eyeFact * 4*bumpFact;
+
+    vec4 finalColor = c1;
+    gl_FragColor = mix(gl_Fog.color, finalColor, fogFactor);
+}
diff --git a/Shaders/water-orig.vert b/Shaders/water-orig.vert
new file mode 100644
index 000000000..ca61aa33c
--- /dev/null
+++ b/Shaders/water-orig.vert
@@ -0,0 +1,15 @@
+varying vec4 rawpos;
+varying vec4 ecPosition;
+varying vec3 VNormal;
+varying vec3 Normal;
+varying vec3 lightVec;
+
+void main(void)
+{
+	rawpos     = gl_Vertex;
+	ecPosition = gl_ModelViewMatrix * gl_Vertex;
+	VNormal = normalize(gl_NormalMatrix * gl_Normal);
+	Normal = normalize(gl_Normal);
+	lightVec = normalize(gl_LightSource[0].position.xyz/* - ecPosition*/);
+	gl_Position = ftransform();
+}
diff --git a/Shaders/water.frag b/Shaders/water.frag
index 50ae098f8..d40c77b1e 100644
--- a/Shaders/water.frag
+++ b/Shaders/water.frag
@@ -1,86 +1,80 @@
-#version 120
+uniform sampler2D water_normalmap;
+uniform sampler2D water_reflection;
+uniform sampler2D water_dudvmap;
+uniform float saturation;
 
-varying vec4 rawpos;
+varying vec4 waterTex1; //moving texcoords
+varying vec4 waterTex2; //moving texcoords
+varying vec4 waterTex4; //viewts
 varying vec4 ecPosition;
-varying vec3 VNormal;
-varying vec3 Normal;
-varying vec3 lightVec;
+varying vec3 viewerdir;
+varying vec3 lightdir;
+varying vec3 normal;
 
-uniform sampler3D NoiseTex;
-uniform float osg_SimulationTime;
-
-//const float scale = 1.0;
-
-void main (void)
+void main(void)
 {
-    vec4 noisevecS   = texture3D(NoiseTex, (rawpos.xyz)*0.0126);
-    vec4 nvLS   = texture3D(NoiseTex, (rawpos.xyz)*-0.0003323417);
+const vec4 sca = vec4(0.005, 0.005, 0.005, 0.005);
+const vec4 sca2 = vec4(0.02, 0.02, 0.02, 0.02);
+const vec4 tscale = vec4(0.25, 0.25, 0.25, 0.25);
 
-    vec4 noisevec   = texture3D(NoiseTex, (rawpos.xyz)*0.00423+vec3(0.0,0.0,osg_SimulationTime*0.035217));
-    vec4 nvL   = texture3D(NoiseTex, (rawpos.xyz)*0.001223417+(0.0,0.0,osg_SimulationTime*-0.0212));
+// compute direction to viewer
+vec3 E = normalize(viewerdir);
 
-    float fogFactor;
-    if (gl_Fog.density == 1.0)
-    {
-       fogFactor=1.0;
-    }
-    else
-    {
-        float fogCoord = ecPosition.z;
-        const float LOG2 = 1.442695;
-        fogFactor = exp2(-gl_Fog.density * gl_Fog.density * fogCoord * fogCoord * LOG2);
-        fogFactor = clamp(fogFactor, 0.0, 1.0);
-    }
+// compute direction to light source
+vec3 L = normalize(lightdir);
 
-    float a=1.0;
-    float n=0.00;
-    n += nvLS[0]*a;
-    a/=2.0;
-    n += nvLS[1]*a;
-    a/=2.0;
-    n += nvLS[2]*a;
-    a/=2.0;
-    n += nvLS[3]*a;
+// half vector
+vec3 H = normalize(L + E);
+	
+const float water_shininess = 240.0;
 
-    a=4.0;
-    float na=n;
-    na += nvL[0]*1.1;
-    a*=1.2;
-    na += nvL[1]*a;
-    a*=1.2;
-    na += nvL[2]*a;
-    a*=1.2;
-    na += nvL[3]*a;
-    a=2.0;
-    na += noisevec[0]*a*0.2;
-    a*=1.2;
-    na += noisevec[1]*a;
-    a*=1.2;
-    na += noisevec[2]*a;
-    a*=1.2;
-    na += noisevec[3]*a;
+vec4 viewt = normalize(waterTex4);
 
-    vec4 c1;
-    c1 = asin(vec4(smoothstep(0.0, 2.2, n), smoothstep(-0.1, 2.10, n), smoothstep(-0.2, 2.0, n), 1.0));
+vec4 disdis = texture2D(water_dudvmap, vec2(waterTex2 * tscale)) * 2.0 - 1.0;
+vec4 dist = texture2D(water_dudvmap, vec2(waterTex1 + disdis*sca2)) * 2.0 - 1.0;
+vec4 fdist = normalize(dist);
+fdist *= sca;
 
-    vec3 Eye = normalize(-ecPosition.xyz);
-    vec3 Reflected = normalize(reflect(-normalize(lightVec), normalize(VNormal+vec3(0.0,0.0,na*0.10-0.24)))); 
+//normalmap
+vec4 nmap0 = texture2D(water_normalmap, vec2(waterTex1+ disdis*sca2)) * 2.0 - 1.0;
+vec4 nmap2 = texture2D(water_normalmap, vec2(waterTex2 * tscale)) * 2.0 - 1.0;
+vec4 vNorm = normalize(nmap0 + nmap2);
 
-    vec3 bump = normalize(VNormal+vec3(0.0, 0.0, na)-0.9);
-    vec3 bumped = max(normalize(refract(lightVec, normalize(bump), 0.16)), 0.0);
+//load reflection
+vec4 tmp = vec4(lightdir, 0.0);
+vec4 refTex = texture2D(water_reflection, vec2(tmp));
+vec4 refl = normalize(refTex);
 
-    vec4 ambientColor = gl_LightSource[0].ambient;
-    vec4 light = ambientColor;
-    c1 *= light;
+vec3 N0 = vec3(texture2D(water_normalmap, vec2(waterTex1+ disdis*sca2)) * 2.0 - 1.0);
+vec3 N1 = vec3(texture2D(water_normalmap, vec2(waterTex2 * tscale)) * 2.0 - 1.0);
+vec3 N = normalize(normal+N0+N1);
 
-    float bumpFact = (bumped.r+bumped.g+bumped.b);
-    float ReflectedEye = max(dot(Reflected, Eye), 0.0);
-    float eyeFact = pow(ReflectedEye, 20.0);
-    c1 += 0.3 * gl_LightSource[0].diffuse * (1.0-eyeFact) * bumpFact*bumpFact;
-    c1 += 0.4 * gl_LightSource[0].diffuse * eyeFact * 3*bumpFact;
-    eyeFact = pow(eyeFact, 20.0);
-    c1 += gl_LightSource[0].specular * eyeFact * 4*bumpFact;
+vec3 specular_color = vec3(gl_LightSource[0].diffuse)
+		* pow(max(0.0, dot(N, H)), water_shininess) * 6.0;
 
-    vec4 finalColor = c1;
-    gl_FragColor = mix(gl_Fog.color, finalColor, fogFactor);
+vec4 specular = vec4(specular_color,0.5);
+
+//calculate fresnel
+vec4 invfres = vec4( dot(vNorm, viewt) );
+vec4 fres = vec4(1.0) + invfres; 
+refl *= fres;
+
+
+specular = specular * saturation;
+
+vec4 finalColor = refl + specular;
+
+float fogFactor;
+float fogCoord = ecPosition.z;
+const float LOG2 = 1.442695;
+fogFactor = exp2(-gl_Fog.density * gl_Fog.density * fogCoord * fogCoord * LOG2);
+
+vec4 ambient_light = gl_LightSource[0].diffuse;
+
+	finalColor *= ambient_light;
+
+	if(gl_Fog.density == 1.0)
+		fogFactor=1.0;
+
+gl_FragColor = mix(gl_Fog.color,finalColor, fogFactor);
 }
diff --git a/Shaders/water.vert b/Shaders/water.vert
index ca61aa33c..1f83a168f 100644
--- a/Shaders/water.vert
+++ b/Shaders/water.vert
@@ -1,15 +1,29 @@
-varying vec4 rawpos;
+varying vec4 waterTex1;
+varying vec4 waterTex2;
+varying vec4 waterTex4;
 varying vec4 ecPosition;
-varying vec3 VNormal;
-varying vec3 Normal;
-varying vec3 lightVec;
+uniform float osg_SimulationTime;
+varying vec3 viewerdir;
+varying vec3 lightdir;
+varying vec3 normal;
 
 void main(void)
 {
-	rawpos     = gl_Vertex;
-	ecPosition = gl_ModelViewMatrix * gl_Vertex;
-	VNormal = normalize(gl_NormalMatrix * gl_Normal);
-	Normal = normalize(gl_Normal);
-	lightVec = normalize(gl_LightSource[0].position.xyz/* - ecPosition*/);
-	gl_Position = ftransform();
-}
+vec3 N = normalize(gl_Normal);
+normal = N;
+
+ecPosition = gl_ModelViewMatrix * gl_Vertex;
+
+viewerdir = vec3(gl_ModelViewMatrixInverse[3]) - vec3(gl_Vertex);
+lightdir = normalize(vec3(gl_ModelViewMatrixInverse * gl_LightSource[0].position));
+
+waterTex4 = vec4( ecPosition.xzy, 0.0 );
+
+vec4 t1 = vec4(0.0, osg_SimulationTime*0.005217, 0.0,0.0);
+vec4 t2 = vec4(0.0, osg_SimulationTime*-0.0012, 0.0,0.0);
+
+waterTex1 = gl_MultiTexCoord0 + t1;
+waterTex2 = gl_MultiTexCoord0 + t2;
+
+gl_Position = ftransform();
+}
\ No newline at end of file
diff --git a/Textures/Water/water-dudv.png b/Textures/Water/water-dudv.png
new file mode 100644
index 000000000..2a3778822
Binary files /dev/null and b/Textures/Water/water-dudv.png differ
diff --git a/Textures/Water/water-normalmap.png b/Textures/Water/water-normalmap.png
new file mode 100644
index 000000000..62e82158f
Binary files /dev/null and b/Textures/Water/water-normalmap.png differ
diff --git a/Textures/Water/water-reflection.png b/Textures/Water/water-reflection.png
new file mode 100644
index 000000000..719668aa7
Binary files /dev/null and b/Textures/Water/water-reflection.png differ
diff --git a/gui/dialogs/AIcarrier.xml b/gui/dialogs/AIcarrier.xml
new file mode 100644
index 000000000..fda87ccb0
--- /dev/null
+++ b/gui/dialogs/AIcarrier.xml
@@ -0,0 +1,221 @@
+<?xml version="1.0"?>
+
+<PropertyList>
+    <name>AIcarrier</name>
+    <modal>false</modal>
+    <layout>vbox</layout>
+    
+
+    <!-- AI Carrier options -->
+
+    <text>
+        <halign>left</halign>
+        <label>AI Carrier</label>
+        <color>
+            <red>0.9</red>
+            <green>0.9</green>
+            <blue>0.9</blue>
+            <alpha>1</alpha>
+        </color>
+    </text>
+
+    <group>
+        <layout>hbox</layout>
+        <empty>
+            <pref-width>10</pref-width>
+        </empty>
+
+        <group>
+            <layout>vbox</layout>
+
+            <radio>
+                <halign>left</halign>
+                <label>Turn to launch course</label>
+                <property>/ai/models/carrier/controls/turn-to-launch-hdg</property>
+                <live>true</live>
+                <binding>
+                    <command>dialog-apply</command>
+                </binding>
+                <binding>
+                    <command>nasal</command>
+                    <script>
+                        var v = getprop("/ai/models/carrier/controls/turn-to-launch-hdg");
+                        foreach (var c; props.globals.getNode("/ai/models").getChildren("carrier")){
+                        c.getNode("controls/turn-to-launch-hdg").setBoolValue(v);
+                        c.getNode("controls/turn-to-recovery-hdg").setBoolValue(0);
+                        c.getNode("controls/turn-to-base-course").setBoolValue(0);
+                        }
+                    </script>
+                </binding>
+            </radio>
+
+            <radio>
+                <halign>left</halign>
+                <label>Turn to recovery course</label>
+                <property>/ai/models/carrier/controls/turn-to-recovery-hdg</property>
+                <live>true</live>
+                <binding>
+                    <command>dialog-apply</command>
+                </binding>
+                <binding>
+                    <command>nasal</command>
+                    <script>
+                        var v = getprop("/ai/models/carrier/controls/turn-to-recovery-hdg");
+                        foreach (var c; props.globals.getNode("/ai/models").getChildren("carrier")){
+                        c.getNode("controls/turn-to-recovery-hdg").setBoolValue(v);
+                        c.getNode("controls/turn-to-launch-hdg").setBoolValue(0);
+                        c.getNode("controls/turn-to-base-course").setBoolValue(0);
+                        }
+                    </script>
+                </binding>
+            </radio>
+
+            <radio>
+                <halign>left</halign>
+                <label>Turn to base course</label>
+                <property>/ai/models/carrier/controls/turn-to-base-course</property>
+                <live>true</live>
+                <binding>
+                    <command>dialog-apply</command>
+                </binding>
+                <binding>
+                    <command>nasal</command>
+                    <script>
+                        var v = getprop("/ai/models/carrier/controls/turn-to-base-course");
+                        foreach (var c; props.globals.getNode("/ai/models").getChildren("carrier")){
+                        c.getNode("controls/turn-to-base-course").setBoolValue(v);
+                        c.getNode("controls/turn-to-recovery-hdg").setBoolValue(0);
+                        c.getNode("controls/turn-to-launch-hdg").setBoolValue(0);
+                        }
+                    </script>
+                </binding>
+            </radio>
+
+            <checkbox>
+                <halign>left</halign>
+                <label>Operate Deck Elevators</label>
+                <property>/ai/models/carrier/controls/elevators</property>
+                <binding>
+                    <command>dialog-apply</command>
+                </binding>
+                <binding>
+                    <command>nasal</command>
+                    <script>
+                        var v = getprop("/ai/models/carrier/controls/elevators");
+                        foreach (var c; props.globals.getNode("/ai/models").getChildren("carrier"))
+                            c.getNode("controls/elevators").setBoolValue(v);
+                    </script>
+                </binding>
+            </checkbox>
+
+            <checkbox>
+                <halign>left</halign>
+                <label>Enable LSO Communications</label>
+                <property>/sim/current-view/lso-commentary</property>
+                <binding>
+                    <command>dialog-apply</command>
+                </binding>
+            </checkbox>
+
+            <checkbox>
+                <halign>left</halign>
+                <label>Enable Deck Park</label>
+                <property>/sim/current-view/deck-park</property>
+                <binding>
+                    <command>dialog-apply</command>
+                </binding>
+            </checkbox>
+
+            <checkbox>
+                <halign>left</halign>
+                <label>Deck Lights</label>
+                <property>/ai/models/carrier/controls/lighting/deck-lights</property>
+                <binding>
+                    <command>dialog-apply</command>
+                </binding>
+                <binding>
+                    <command>nasal</command>
+                    <script>
+                        var v = getprop("/ai/models/carrier/controls/lighting/deck-lights");
+                        foreach (var c; props.globals.getNode("/ai/models").getChildren("carrier"))
+                            c.getNode("controls/lighting/deck-lights",1).setBoolValue(v);
+                    </script>
+                </binding>
+            </checkbox>
+
+            <text>
+                <halign>left</halign>
+                <label>Discrete Flightdeck Floodlights (Red)</label>
+            </text>
+
+            <slider>
+                <halign>left</halign>
+                <width>75</width>
+                <height>25</height>
+                <property>/ai/models/carrier/controls/lighting/flood-lights-red-norm</property>
+                <binding>
+                    <command>nasal</command>
+                    <script>
+                        var v = getprop("/ai/models/carrier/controls/lighting/flood-lights-red-norm");
+                        foreach (var c; props.globals.getNode("/ai/models").getChildren("carrier"))
+                            c.getNode("controls/lighting/flood-lights-red-norm",1).setDoubleValue(v);
+                    </script>
+                </binding>
+            </slider>
+
+        </group>
+
+        <empty>
+            <stretch>true</stretch>
+        </empty>
+    </group>
+
+    <group>
+        <layout>hbox</layout>
+        <default-padding>6</default-padding>
+        <empty>
+            <stretch>true</stretch>
+        </empty>
+
+        <button>
+            <legend>OK</legend>
+            <default>true</default>
+            <equal>true</equal>
+            <binding>
+                <command>dialog-apply</command>
+            </binding>
+            <binding>
+                <command>dialog-close</command>
+            </binding>
+        </button>
+
+        <button>
+            <legend>Apply</legend>
+            <equal>true</equal>
+            <binding>
+                <command>dialog-apply</command>
+            </binding>
+        </button>
+
+        <button>
+            <legend>Reset</legend>
+            <equal>true</equal>
+            <binding>
+                <command>dialog-update</command>
+            </binding>
+        </button>
+
+        <button>
+            <legend>Cancel</legend>
+            <equal>true</equal>
+            <key>Esc</key>
+            <binding>
+                <command>dialog-close</command>
+            </binding>
+        </button>
+
+        <empty>
+            <stretch>true</stretch>
+        </empty>
+    </group>
+</PropertyList>
\ No newline at end of file
diff --git a/gui/dialogs/ai.xml b/gui/dialogs/ai.xml
new file mode 100644
index 000000000..bba1c22eb
--- /dev/null
+++ b/gui/dialogs/ai.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+
+<!-- General ATC/AI options -->
+
+<PropertyList>
+    <name>ai</name>
+    <modal>false</modal>
+    <layout>vbox</layout>
+
+
+
+    <button>
+      <legend>-</legend>
+      <pref-width>16</pref-width>
+      <pref-height>16</pref-height>
+      <halign>right</halign>
+      <border>2</border>
+      <binding>
+        <command>dialog-close</command>
+      </binding>
+    </button>
+
+    <text>
+        <!-- <label>ATC/AI Options</label> -->
+        <label>AI Options</label>
+    </text>
+
+    <hrule/>
+
+    <group>
+        <layout>hbox</layout>
+        <empty>
+            <pref-width>10</pref-width>
+        </empty>
+
+        <group>
+            <layout>vbox</layout>
+
+           <!--  <checkbox>
+                <halign>left</halign>
+                <label>Enable ATC</label>
+                <property>/sim/atc/enabled</property>
+            </checkbox> -->
+
+            <checkbox>
+                <halign>left</halign>
+                <label>Enable AI traffic</label>
+                <property>/sim/ai-traffic/enabled</property>
+            </checkbox>
+
+            <group>
+                <layout>hbox</layout>
+
+                <text>
+                    <halign>left</halign>
+                    <label>AI traffic density:</label>
+                </text>
+
+                <combo>
+                    <halign>left</halign>
+                    <property>/sim/ai-traffic/level</property>
+                    <value>1</value>
+                    <value>2</value>
+                    <value>3</value>
+                </combo>
+            </group>
+
+        </group>
+
+        <empty>
+            <stretch>true</stretch>
+        </empty>
+    </group>
+</PropertyList>
\ No newline at end of file
diff --git a/gui/dialogs/display.xml b/gui/dialogs/display.xml
index bc7eccaa6..a2861d45e 100644
--- a/gui/dialogs/display.xml
+++ b/gui/dialogs/display.xml
@@ -42,13 +42,23 @@
       </binding>
     </checkbox>
 
-    <item>
+    <checkbox>
+      <halign>left</halign>
       <label>Show 2D Panel</label>
       <property>/sim/panel/visibility</property>
       <binding>
         <command>dialog-apply</command>
       </binding>
-    </item>
+    </checkbox>
+
+    <checkbox>
+      <halign>left</halign>
+      <label>Autohide Menubar</label>
+      <property>/sim/menubar/autovisibility/enabled</property>
+      <binding>
+        <command>dialog-apply</command>
+      </binding>
+    </checkbox>
   </group>
 
   <hrule/>
diff --git a/gui/dialogs/formation.xml b/gui/dialogs/formation.xml
new file mode 100644
index 000000000..6171a11a0
--- /dev/null
+++ b/gui/dialogs/formation.xml
@@ -0,0 +1,237 @@
+<?xml version="1.0"?>
+
+
+<PropertyList>
+	<name>formation</name>
+	<modal>false</modal>
+	<layout>vbox</layout>
+
+	<!-- AI Wingman options -->
+
+	<text>
+		<halign>left</halign>
+		<label>Wingman Controls</label>
+		<color>
+			<red>0.5</red>
+			<green>0.5</green>
+			<blue>0.5</blue>
+			<alpha>1</alpha>
+		</color>
+	</text>
+
+	<group>
+		<layout>hbox</layout>
+		<empty>
+			<pref-width>10</pref-width>
+		</empty>
+
+		<group>
+			<layout>vbox</layout>
+
+			<radio>
+				<halign>left</halign>
+				<label>Formate</label>
+				<property>/sim/ai/models/wingman/controls/formate-to-ac</property>
+				<live>true</live>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<binding>
+					<command>nasal</command>
+					<script>
+						var v = getprop("/sim/ai/models/wingman/controls/formate-to-ac");
+						setprop("/sim/ai/models/wingman/controls/break",0);
+						setprop("/sim/ai/models/wingman/controls/join",0);
+						foreach (var c; props.globals.getNode("/ai/models").getChildren("wingman")){
+						c.getNode("controls/formate-to-ac").setBoolValue(v);
+						c.getNode("controls/break").setBoolValue(0);
+						c.getNode("controls/join").setBoolValue(0);
+						}
+					</script>
+				</binding>
+			</radio>
+
+			<radio>
+				<halign>left</halign>
+				<label>Break Formation</label>
+				<property>/sim/ai/models/wingman/controls/break</property>
+				<live>true</live>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<binding>
+					<command>nasal</command>
+					<script>
+						var v = getprop("/sim/ai/models/wingman/controls/break");
+						setprop("/sim/ai/models/wingman/controls/formate-to-ac",0);
+						setprop("/sim/ai/models/wingman/controls/join",0);
+
+						foreach (var c; props.globals.getNode("/ai/models").getChildren("wingman")){
+						c.getNode("controls/break").setBoolValue(v);
+						c.getNode("controls/formate-to-ac").setBoolValue(0);
+						c.getNode("controls/join").setBoolValue(0);
+						}
+					</script>
+				</binding>
+			</radio>
+
+			<radio>
+				<halign>left</halign>
+				<label>Join</label>
+				<property>/sim/ai/models/wingman/controls/join</property>
+				<live>true</live>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<binding>
+					<command>nasal</command>
+					<script>
+						var v = getprop("/sim/ai/models/wingman/controls/join");
+						setprop("/sim/ai/models/wingman/controls/formate-to-ac",0);
+						setprop("/sim/ai/models/wingman/controls/break",0);
+
+						foreach (var c; props.globals.getNode("/ai/models").getChildren("wingman")){
+						c.getNode("controls/join").setBoolValue(v);
+						c.getNode("controls/break").setBoolValue(0);
+						c.getNode("controls/formate-to-ac").setBoolValue(0);
+						}
+					</script>
+				</binding>
+			</radio>
+
+		</group>
+
+		<group>
+			<layout>vbox</layout>
+
+			<text>
+				<halign>left</halign>
+				<label>Break Heading Degrees Relative</label>
+			</text>
+
+			<text>
+				<label>Left/Right</label>
+			</text>
+
+			<group>
+				<layout>hbox</layout>
+				<text>
+					<halign>left</halign>
+					<label>-180</label>
+				</text>
+			<slider>
+				<width>75</width>
+				<height>25</height>
+				<min>-180</min>
+				<max>180</max>
+				<property>/ai/models/wingman/controls/break-deg-rel</property>
+				<binding>
+					<command>dialog-apply</command>
+				</binding>
+				<binding>
+					<command>nasal</command>
+					<script>
+						var v = getprop("/ai/models/wingman/controls/break-deg-rel");
+						foreach (var c; props.globals.getNode("/ai/models").getChildren("wingman")){
+						print("FFF ", v, " ", c.getNode("name").getValue());
+						c.getNode("controls/break-deg-rel",1).setDoubleValue(v);
+						}
+					</script>
+				</binding>
+			</slider>
+				<text>
+					<halign>left</halign>
+
+				<label>180</label>
+
+			</text>
+			</group>
+
+			<text>
+				<label>-100.00</label>
+				<format>%-0.1f deg</format>
+				<live>true</live>
+				<property>/ai/models/wingman/controls/break-deg-rel</property>
+			</text>
+
+		</group>
+
+
+
+
+	</group>
+
+
+
+
+
+	<group>
+		<layout>hbox</layout>
+
+		<text>
+			<halign>left</halign>
+			<label>Target Heading Degrees True</label>
+		</text>
+
+		<text>
+			<halign>left</halign>
+			<label>-100.00</label>
+			<format>%-0.1f deg</format>
+			<live>true</live>
+			<property>/ai/models/wingman/controls/tgt-heading-deg</property>
+		</text>
+	</group>
+
+	<empty>
+		<stretch>true</stretch>
+	</empty>
+
+	<group>
+		<layout>hbox</layout>
+		<default-padding>6</default-padding>
+		<empty>
+			<stretch>true</stretch>
+		</empty>
+
+		<button>
+			<legend>OK</legend>
+			<default>true</default>
+			<equal>true</equal>
+			<binding>
+				<command>dialog-apply</command>
+			</binding>
+			<binding>
+				<command>dialog-close</command>
+			</binding>
+		</button>
+
+		<button>
+			<legend>Apply</legend>
+			<equal>true</equal>
+			<binding>
+				<command>dialog-apply</command>
+			</binding>
+		</button>
+
+		<button>
+			<legend>Reset</legend>
+			<equal>true</equal>
+			<binding>
+				<command>dialog-update</command>
+			</binding>
+		</button>
+
+		<button>
+			<legend>Cancel</legend>
+			<equal>true</equal>
+			<key>Esc</key>
+			<binding>
+				<command>dialog-close</command>
+			</binding>
+		</button>
+
+		<empty>
+			<stretch>true</stretch>
+		</empty>
+	</group>
+</PropertyList>
diff --git a/gui/dialogs/radios.xml b/gui/dialogs/radios.xml
index bd8f95bc3..900962601 100644
--- a/gui/dialogs/radios.xml
+++ b/gui/dialogs/radios.xml
@@ -4,7 +4,7 @@
 
  <name>radios</name>
  <width>600</width>
- <height>330</height>
+ <height>370</height>
  <modal>false</modal>
 
  <text>
@@ -505,5 +505,15 @@
   </button>
 
  </group>
+	<group>
+		<x>400</x>
+		<y>60</y>
+			<button>
+			<legend>ATC Services in range</legend>
+				<binding>
+					<command>ATC-freq-search</command>
+				</binding> 
+			</button>
+	</group>
 
 </PropertyList>
diff --git a/gui/dialogs/osg_display_settings.xml b/gui/dialogs/stereoscopic-view-options.xml
similarity index 54%
rename from gui/dialogs/osg_display_settings.xml
rename to gui/dialogs/stereoscopic-view-options.xml
index da319f633..b873861fa 100644
--- a/gui/dialogs/osg_display_settings.xml
+++ b/gui/dialogs/stereoscopic-view-options.xml
@@ -2,8 +2,7 @@
 
 <PropertyList>
 
-  <!-- Control the weather -->
-  <name>osg-display-settings</name>
+  <name>stereoscopic-view-options</name>
   <modal>false</modal>
   <resizable>false</resizable>
   <layout>vbox</layout>
@@ -18,7 +17,7 @@
     </empty>
 
     <text>
-      <label>OSG Display Settings (experimental)</label>
+      <label>Stereoscopic View Options</label>
     </text>
 
     <empty>
@@ -71,7 +70,7 @@
     <empty><stretch>true</stretch></empty>
     <slider>
       <min>0</min>
-      <max>1.0</max>
+      <max>10.0</max>
       <property>/sim/rendering/osg-displaysettings/screen-distance</property>
       <binding>
         <command>dialog-apply</command>
@@ -106,77 +105,4 @@
       </text>
   </group>
 
-  <group>
-    <layout>hbox</layout>
-    <default-padding>1</default-padding>
-    <text><label>Double Buffer</label></text>
-    <empty><stretch>true</stretch></empty>
-    <checkbox>
-      <live>true</live>
-      <property>/sim/rendering/osg-displaysettings/double-buffer</property>
-      <binding>
-        <command>dialog-apply</command>
-      </binding>
-    </checkbox>
-  </group>
-
-  <group>
-    <layout>hbox</layout>
-    <default-padding>1</default-padding>
-    <text><label>Depth Buffer</label></text>
-    <empty><stretch>true</stretch></empty>
-    <checkbox>
-      <live>true</live>
-      <property>/sim/rendering/osg-displaysettings/depth-buffer</property>
-      <binding>
-        <command>dialog-apply</command>
-      </binding>
-    </checkbox>
-  </group>
-
-  <group>
-    <layout>hbox</layout>
-    <default-padding>1</default-padding>
-    <text><label>RGB</label></text>
-    <empty><stretch>true</stretch></empty>
-    <checkbox>
-      <live>true</live>
-      <property>/sim/rendering/osg-displaysettings/rgb</property>
-      <binding>
-        <command>dialog-apply</command>
-      </binding>
-    </checkbox>
-  </group>
-
-  <group>
-    <layout>hbox</layout>
-    <default-padding>1</default-padding>
-    <text><label>Screen Width</label></text>
-    <empty><stretch>true</stretch></empty>
-    <input>
-      <width>100</width>
-      <height>25</height>
-      <live>true</live>
-      <property>/sim/rendering/osg-displaysettings/screen-width</property>
-      <binding>
-        <command>dialog-apply</command>
-      </binding>
-    </input>
-  </group>
-
-  <group>
-    <layout>hbox</layout>
-    <default-padding>1</default-padding>
-    <text><label>Screen Height</label></text>
-    <empty><stretch>true</stretch></empty>
-    <input>
-      <width>100</width>
-      <height>25</height>
-      <live>true</live>
-      <property>/sim/rendering/osg-displaysettings/screen-height</property>
-      <binding>
-        <command>dialog-apply</command>
-      </binding>
-    </input>
-  </group>
 </PropertyList>
diff --git a/gui/dialogs/view.xml b/gui/dialogs/view.xml
index d1c1a2ad7..b105ee1db 100644
--- a/gui/dialogs/view.xml
+++ b/gui/dialogs/view.xml
@@ -6,7 +6,7 @@
 	<layout>vbox</layout>
 
 	<text>
-		<label>Configure Active Views</label>
+		<label>Choose Active Views</label>
 	</text>
 
 	<hrule/>
diff --git a/gui/dialogs/weather.xml b/gui/dialogs/weather.xml
index 362c0e322..b0e8b8a1a 100644
--- a/gui/dialogs/weather.xml
+++ b/gui/dialogs/weather.xml
@@ -1,1051 +1,1664 @@
-<?xml version="1.0"?>
-
-<PropertyList>
-
-  <!-- Control the weather -->
-  <name>weather</name>
-  <modal>false</modal>
-  <resizable>false</resizable>
-  <layout>vbox</layout>
-  <default-padding>3</default-padding>
-
-  <!-- Title bar with close button -->
-  <group>
-    <layout>hbox</layout>
-    <default-padding>1</default-padding>
-
-    <empty>
-      <stretch>true</stretch>
-    </empty>
-
-    <text>
-      <label>Global Troposphere Weather Conditions</label>
-    </text>
-
-    <empty>
-      <stretch>true</stretch>
-    </empty>
-
-    <button>
-      <legend/>
-      <key>Esc</key>
-      <pref-width>16</pref-width>
-      <pref-height>16</pref-height>
-      <border>2</border>
-      <binding>
-        <command>dialog-close</command>
-      </binding>
-    </button>
-  </group>
-  <hrule/>
-
-  <group>
-    <layout>hbox</layout>
-    <default-padding>0</default-padding>
-
-    <!-- Left Column -->
-    <group>
-      <layout>vbox</layout>
-      <group>
-        <layout>vbox</layout>
-        <default-padding>1</default-padding>
-
-        <!-- Cloud Layers -->
-        <group>
-          <layout>hbox</layout>
-          <text>
-            <label>Cloud Layers (All Altitudes ft-AMSL)</label>
-          </text>
-          <hrule>
-            <stretch>true</stretch>
-          </hrule>
-        </group>
-
-        <group>
-          <layout>hbox</layout>
-          <group>
-            <layout>table</layout>
-
-            <text>
-              <label>Altitude (ft)</label>
-              <row>0</row>
-              <col>1</col>
-            </text>
-
-            <text>
-              <label>Coverage</label>
-              <row>0</row>
-              <col>2</col>
-              <width>80</width>
-            </text>
-
-            <text>
-              <label>Thickness (ft)</label>
-              <row>0</row>
-              <col>3</col>
-            </text>
-
-
-            <!-- Layer 4 -->
-
-            <input>
-              <row>1</row>
-              <col>1</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[4]/elevation-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-            </input>
-
-            <combo>
-              <row>1</row>
-              <col>2</col>
-              <pref-width>100</pref-width>
-              <live>true</live>
-              <property>/environment/clouds/layer[4]/coverage</property>
-              <value>clear</value>
-              <value>few</value>
-              <value>scattered</value>
-              <value>broken</value>
-              <value>overcast</value>
-              <value>cirrus</value>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-            </combo>
-
-            <input>
-              <row>1</row>
-              <col>3</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[4]/thickness-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-            </input>
-
-
-            <!-- Layer 3 -->
-
-            <input>
-              <row>2</row>
-              <col>1</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[3]/elevation-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-            </input>
-
-            <combo>
-              <row>2</row>
-              <col>2</col>
-              <pref-width>100</pref-width>
-              <live>true</live>
-              <property>/environment/clouds/layer[3]/coverage</property>
-              <value>clear</value>
-              <value>few</value>
-              <value>scattered</value>
-              <value>broken</value>
-              <value>overcast</value>
-              <value>cirrus</value>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-            </combo>
-
-            <input>
-              <row>2</row>
-              <col>3</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[3]/thickness-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-            </input>
-
-
-            <!-- Layer 2 -->
-
-            <input>
-              <row>3</row>
-              <col>1</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[2]/elevation-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-            </input>
-
-            <combo>
-              <row>3</row>
-              <col>2</col>
-              <pref-width>100</pref-width>
-              <live>true</live>
-              <property>/environment/clouds/layer[2]/coverage</property>
-              <value>clear</value>
-              <value>few</value>
-              <value>scattered</value>
-              <value>broken</value>
-              <value>overcast</value>
-              <value>cirrus</value>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-            </combo>
-
-            <input>
-              <row>3</row>
-              <col>3</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[2]/thickness-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-            </input>
-
-
-            <!-- Layer 1 -->
-
-            <input>
-              <row>4</row>
-              <col>1</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[1]/elevation-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-            </input>
-
-            <combo>
-              <row>4</row>
-              <col>2</col>
-              <pref-width>100</pref-width>
-              <live>true</live>
-              <property>/environment/clouds/layer[1]/coverage</property>
-              <value>clear</value>
-              <value>few</value>
-              <value>scattered</value>
-              <value>broken</value>
-              <value>overcast</value>
-              <value>cirrus</value>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-            </combo>
-
-            <input>
-              <row>4</row>
-              <col>3</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[1]/thickness-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-            </input>
-
-
-            <!-- Layer 0 -->
-
-            <input>
-              <row>5</row>
-              <col>1</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[0]/elevation-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-            </input>
-
-            <combo>
-              <row>5</row>
-              <col>2</col>
-              <pref-width>100</pref-width>
-              <live>true</live>
-              <editable>false</editable>
-              <property>/environment/clouds/layer[0]/coverage</property>
-              <value>clear</value>
-              <value>few</value>
-              <value>scattered</value>
-              <value>broken</value>
-              <value>overcast</value>
-              <value>cirrus</value>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-            </combo>
-
-            <input>
-              <row>5</row>
-              <col>3</col>
-              <live>true</live>
-              <property>/environment/clouds/layer[0]/thickness-ft</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-            </input>
-
-          </group>
-          <empty>
-            <stretch>true</stretch>
-          </empty>
-        </group>
-      </group>
-      <!-- Cloud Layers End -->
-
-      <!-- Precipitation -->
-      <group>
-        <layout>vbox</layout>
-        <default-padding>1</default-padding>
-
-        <group>
-          <layout>hbox</layout>
-          <text>
-            <label>Precipitation</label>
-          </text>
-          <hrule>
-            <stretch>true</stretch>
-          </hrule>
-        </group>
-
-        <group>
-          <layout>hbox</layout>
-          <halign>fill</halign>
-          <group>
-            <layout>table</layout>
-            <text>
-              <row>0</row>
-              <col>0</col>
-              <label>Rain</label>
-            </text>
-
-            <text>
-              <row>0</row>
-              <col>1</col>
-              <label>Snow</label>
-            </text>
-
-            <slider>
-              <row>1</row>
-              <col>0</col>
-              <live>true</live>
-              <halign>fill</halign>
-              <property>/environment/metar/rain-norm</property>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-              <stretch>true</stretch>
-            </slider>
-
-            <slider>
-              <row>1</row>
-              <col>1</col>
-              <halign>fill</halign>
-              <property>/environment/metar/snow-norm</property>
-              <live>true</live>
-              <pref-height>30</pref-height>
-              <binding>
-                <command>dialog-apply</command>
-              </binding>
-            </slider>
-
-            <text>
-              <row>0</row>
-              <col>3</col>
-              <label>QNH (inHg)</label>
-            </text>
-
-            <input>
-              <row>1</row>
-              <col>3</col>
-              <live>true</live>
-              <pref-width>50</pref-width>
-              <property>/environment/config/boundary/entry[0]/pressure-sea-level-inhg</property>
-            </input>
-
-            <empty>
-              <row>2</row>
-              <col>0</col>
-              <colspan>3</colspan>
-              <pref-height>30</pref-height>
-            </empty>
-
-          </group>
-
-          <empty>
-            <stretch>true</stretch>
-          </empty>
-        </group>
-      </group>
-      <!-- Precipitation End  -->
-    </group>
-    <!-- Left Column End -->
-
-    <vrule>
-      <stretch>true</stretch>
-    </vrule>
-
-    <!-- Right Column -->
-    <group>
-      <layout>vbox</layout>
-    
-      <!-- Aloft -->
-      <group>
-        <layout>vbox</layout>
-        <default-padding>1</default-padding>
-
-        <group>
-          <layout>hbox</layout>
-          <text>
-            <label>Aloft (All Altitudes ft-AMSL)</label>
-          </text>
-          <hrule>
-            <stretch>true</stretch>
-          </hrule>
-        </group>
-
-        <group>
-          <layout>hbox</layout>
-          <group>
-            <layout>table</layout>
-            <text>
-              <row>0</row>
-              <col>0</col>
-              <label>Altitude</label>
-            </text>
-
-            <text>
-              <row>0</row>
-              <col>1</col>
-              <colspan>2</colspan>
-              <label>Wind (dir/kt)</label>
-            </text>
-
-            <text>
-              <row>0</row>
-              <col>3</col>
-              <label>Vis (m)</label>
-            </text>
-
-            <text>
-              <row>0</row>
-              <col>4</col>
-              <label>Temp (C)</label>
-            </text>
-
-            <text>
-              <row>0</row>
-              <col>5</col>
-              <label>Dewpt (C)</label>
-            </text>
-
-            <input>
-              <row>1</row>
-              <col>0</col>
-              <pref-width>52</pref-width>
-              <property>/environment/config/aloft/entry[4]/elevation-ft</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>1</row>
-              <col>1</col>
-              <pref-width>40</pref-width>
-              <property>/environment/config/aloft/entry[4]/wind-from-heading-deg</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>1</row>
-              <col>2</col>
-              <pref-width>35</pref-width>
-              <property>/environment/config/aloft/entry[4]/wind-speed-kt</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>1</row>
-              <col>3</col>
-              <pref-width>55</pref-width>
-              <property>/environment/config/aloft/entry[4]/visibility-m</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>1</row>
-              <col>4</col>
-              <pref-width>60</pref-width>
-              <property>/environment/config/aloft/entry[4]/temperature-degc</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>1</row>
-              <col>5</col>
-              <pref-width>60</pref-width>
-              <property>/environment/config/aloft/entry[4]/dewpoint-degc</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>2</row>
-              <col>0</col>
-              <pref-width>52</pref-width>
-              <property>/environment/config/aloft/entry[3]/elevation-ft</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>2</row>
-              <col>1</col>
-              <pref-width>40</pref-width>
-              <property>/environment/config/aloft/entry[3]/wind-from-heading-deg</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>2</row>
-              <col>2</col>
-              <pref-width>35</pref-width>
-              <property>/environment/config/aloft/entry[3]/wind-speed-kt</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>2</row>
-              <col>3</col>
-              <pref-width>55</pref-width>
-              <property>/environment/config/aloft/entry[3]/visibility-m</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>2</row>
-              <col>4</col>
-              <pref-width>60</pref-width>
-              <property>/environment/config/aloft/entry[3]/temperature-degc</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>2</row>
-              <col>5</col>
-              <pref-width>60</pref-width>
-              <property>/environment/config/aloft/entry[3]/dewpoint-degc</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>3</row>
-              <col>0</col>
-              <pref-width>52</pref-width>
-              <property>/environment/config/aloft/entry[2]/elevation-ft</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>3</row>
-              <col>1</col>
-              <pref-width>40</pref-width>
-              <property>/environment/config/aloft/entry[2]/wind-from-heading-deg</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>3</row>
-              <col>2</col>
-              <pref-width>35</pref-width>
-              <property>/environment/config/aloft/entry[2]/wind-speed-kt</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>3</row>
-              <col>3</col>
-              <pref-width>55</pref-width>
-              <property>/environment/config/aloft/entry[2]/visibility-m</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>3</row>
-              <col>4</col>
-              <pref-width>60</pref-width>
-              <property>/environment/config/aloft/entry[2]/temperature-degc</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>3</row>
-              <col>5</col>
-              <pref-width>60</pref-width>
-              <property>/environment/config/aloft/entry[2]/dewpoint-degc</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>4</row>
-              <col>0</col>
-              <pref-width>52</pref-width>
-              <property>/environment/config/aloft/entry[1]/elevation-ft</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>4</row>
-              <col>1</col>
-              <pref-width>40</pref-width>
-              <property>/environment/config/aloft/entry[1]/wind-from-heading-deg</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>4</row>
-              <col>2</col>
-              <pref-width>35</pref-width>
-              <property>/environment/config/aloft/entry[1]/wind-speed-kt</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>4</row>
-              <col>3</col>
-              <pref-width>55</pref-width>
-              <property>/environment/config/aloft/entry[1]/visibility-m</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>4</row>
-              <col>4</col>
-              <pref-width>60</pref-width>
-              <property>/environment/config/aloft/entry[1]/temperature-degc</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>4</row>
-              <col>5</col>
-              <pref-width>60</pref-width>
-              <property>/environment/config/aloft/entry[1]/dewpoint-degc</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>5</row>
-              <col>0</col>
-              <pref-width>52</pref-width>
-              <property>/environment/config/aloft/entry[0]/elevation-ft</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>5</row>
-              <col>1</col>
-              <pref-width>40</pref-width>
-              <property>/environment/config/aloft/entry[0]/wind-from-heading-deg</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>5</row>
-              <col>2</col>
-              <pref-width>35</pref-width>
-              <property>/environment/config/aloft/entry[0]/wind-speed-kt</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>5</row>
-              <col>3</col>
-              <pref-width>55</pref-width>
-              <property>/environment/config/aloft/entry[0]/visibility-m</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>5</row>
-              <col>4</col>
-              <pref-width>60</pref-width>
-              <property>/environment/config/aloft/entry[0]/temperature-degc</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>5</row>
-              <col>5</col>
-              <pref-width>60</pref-width>
-              <property>/environment/config/aloft/entry[0]/dewpoint-degc</property>
-              <live>true</live>
-            </input>
-          </group>
-          <empty>
-            <stretch>true</stretch>
-          </empty>
-        </group>
-
-      </group>
-      <!-- Aloft End -->
-
-      <!-- Boundary  -->
-      <group>
-        <layout>vbox</layout>
-        <default-padding>1</default-padding>
-
-        <group>
-          <layout>hbox</layout>
-          <text>
-            <label>Boundary (All Elevations ft-AGL)</label>
-          </text>
-          <hrule>
-            <stretch>true</stretch>
-          </hrule>
-        </group>
-
-        <group>
-          <layout>hbox</layout>
-          <group>
-
-            <layout>table</layout>
-
-            <text>
-              <row>0</row>
-              <col>0</col>
-              <label>Elevation</label>
-            </text>
-
-            <text>
-              <row>0</row>
-              <col>1</col>
-              <colspan>2</colspan>
-              <label>Wind (dir/kt)</label>
-            </text>
-
-            <text>
-              <row>0</row>
-              <col>3</col>
-              <label>Vis (m)</label>
-            </text>
-
-            <text>
-              <row>0</row>
-              <col>4</col>
-              <label>Temp (C)</label>
-            </text>
-
-            <text>
-              <row>0</row>
-              <col>5</col>
-              <label>Dewpt (C)</label>
-            </text>
-
-            <input>
-              <row>1</row>
-              <col>0</col>
-              <pref-width>52</pref-width>
-              <property>/environment/config/boundary/entry[1]/elevation-ft</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>1</row>
-              <col>1</col>
-              <pref-width>40</pref-width>
-              <property>/environment/config/boundary/entry[1]/wind-from-heading-deg</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>1</row>
-              <col>2</col>
-              <pref-width>35</pref-width>
-              <property>/environment/config/boundary/entry[1]/wind-speed-kt</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>1</row>
-              <col>3</col>
-              <pref-width>55</pref-width>
-              <property>/environment/config/boundary/entry[1]/visibility-m</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>1</row>
-              <col>4</col>
-              <pref-width>60</pref-width>
-              <property>/environment/config/boundary/entry[1]/temperature-degc</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>1</row>
-              <col>5</col>
-              <pref-width>60</pref-width>
-              <property>/environment/config/boundary/entry[1]/dewpoint-degc</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>2</row>
-              <col>0</col>
-              <pref-width>52</pref-width>
-              <property>/environment/config/boundary/entry[0]/elevation-ft</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>2</row>
-              <col>1</col>
-              <pref-width>40</pref-width>
-              <property>/environment/config/boundary/entry[0]/wind-from-heading-deg</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>2</row>
-              <col>2</col>
-              <pref-width>35</pref-width>
-              <property>/environment/config/boundary/entry[0]/wind-speed-kt</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>2</row>
-              <col>3</col>
-              <pref-width>55</pref-width>
-              <property>/environment/config/boundary/entry[0]/visibility-m</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>2</row>
-              <col>4</col>
-              <pref-width>60</pref-width>
-              <property>/environment/config/boundary/entry[0]/temperature-degc</property>
-              <live>true</live>
-            </input>
-
-            <input>
-              <row>2</row>
-              <col>5</col>
-              <pref-width>60</pref-width>
-              <property>/environment/config/boundary/entry[0]/dewpoint-degc</property>
-              <live>true</live>
-            </input>
-          </group>
-          <empty>
-            <stretch>true</stretch>
-          </empty>
-        </group>
-
-      </group>
-      <!-- Boundary  End -->
-    
-    </group>
-    <!-- Right Column -->
-
-  </group>
-
-  <group>
-    <layout>vbox</layout>
-
-    <!-- Automatic Weather -->
-    <group>
-      <layout>hbox</layout>
-      <text>
-        <label>Automatic Weather Generation</label>
-      </text>
-      <hrule>
-        <stretch>true</stretch>
-      </hrule>
-    </group>
-
-    <group>
-      <layout>hbox</layout>
-      <text>
-        <label>METAR Source</label>
-      </text>
-      <combo>
-        <name>source-selection</name>
-        <halign>fill</halign>
-        <stretch>true</stretch>
-        <property>sim/gui/dialogs/weather-scenario/source-selection</property>
-        <binding>
-          <command>dialog-apply</command>
-          <object-name>source-selection</object-name>
-        </binding>
-        <binding>
-          <command>dialog-update</command>
-          <object-name>metar</object-name>
-        </binding>
-        <binding>
-          <command>nasal</command>
-          <script>apply()</script>
-        </binding>
-      </combo>
-
-      <checkbox>
-        <property>/environment/params/metar-updates-winds-aloft</property>
-        <label>Update winds aloft</label>
-        <live>true</live>
-        <binding>
-          <command>dialog-apply</command>
-        </binding>
-        <name>aloft</name>
-      </checkbox>
-
-    </group>
-
-    <textbox>
-      <name>description</name>
-      <halign>fill</halign>
-      <stretch>true</stretch>
-      <pref-width>180</pref-width>
-      <pref-height>60</pref-height>
-      <slider>20</slider>
-      <editable>false</editable>
-      <wrap>true</wrap>
-      <live>true</live>
-      <property>sim/gui/dialogs/weather-scenario/description</property>
-    </textbox>
-
-    <group>
-      <layout>hbox</layout>
-      <text>
-        <label>METAR Data</label>
-      </text>
-      <empty>
-        <stretch>true</stretch>
-      </empty>
-    </group>
-
-    <textbox>
-      <name>metar</name>
-      <halign>fill</halign>
-      <stretch>true</stretch>
-      <pref-width>180</pref-width>
-      <pref-height>50</pref-height>
-      <slider>20</slider>
-      <editable>true</editable>
-      <wrap>true</wrap>
-      <live>false</live>
-      <property>sim/gui/dialogs/weather-scenario/metar</property>
-    </textbox>
-
-    <!-- Automatic Weather -->
-    
-  </group>
-
-  <nasal>
-    <open><![CDATA[
-      var dlg_root = cmdarg();
-
-      var normalize_string = func(src) {
-        if( src == nil ) src = "";
-        var dst = "";
-        for( var i = 0; i < size(src); i+=1 ) {
-          if( src[i] == `\n` or src[i] == `\r` )
-            src[i] = ` `;
-
-          if( i != 0 and src[i] == ` ` and src[i-1] == ` ` )
-            continue;
-
-          dst = dst ~ " ";
-          dst[size(dst)-1] = src[i];
-        }
-        return dst;
-      }
-
-      var findScenarioByName = func(name) {
-        var wsn = props.globals.getNode( "/environment/weather-scenarios" );
-        if( wsn != nil ) {
-          var scenarios = wsn.getChildren("scenario");
-          foreach (var scenario; scenarios ) {
-            if( scenario.getNode("name").getValue() == name )
-              return scenario;
-          }
-        }
-        return nil;
-      }
-
-      var findElementByName = func(rootN, name) {
-        foreach( var child; rootN.getChildren() ) {
-          var n = child.getNode( "name" );
-          if( n != nil and n.getValue() == name )
-            return child;
-          var f = findElementByName(child,name);
-          if( f != nil ) return f;
-        }
-        return nil;
-      };
-
-      var propertyChangeListener = setlistener( "sim/gui/dialogs/weather-scenario/source-selection", func(n) {
-        description = "";
-        metar = "nil";
-        var scenario = findScenarioByName( n.getValue() );
-        if( scenario != nil ) {
-          description = normalize_string(scenario.getNode("description", 1 ).getValue());
-          metar = normalize_string(scenario.getNode("metar", 1 ).getValue());
-        }
-        setprop("sim/gui/dialogs/weather-scenario/description", description );
-        setprop("sim/gui/dialogs/weather-scenario/metar", metar );
-      });
-
-      var metarListener = setlistener( "environment/metar/valid", func(n) {
-        var metar = getprop("environment/metar/data");
-        if( metar == nil or metar == "" ) metar = "NIL";
-        metar = normalize_string(metar);
-        setprop("sim/gui/dialogs/weather-scenario/metar", metar );
-        gui.dialog_update( "weather", "metar" );
-      }, 1, 0);
-
-      #initialize the METAR source selection
-      if( getprop( "environment/params/metar-updates-environment" ) == 0 ) {
-        setprop("sim/gui/dialogs/weather-scenario/source-selection", "Disabled" );
-      } else if( getprop( "environment/realwx/enabled" ) ) {
-        setprop("sim/gui/dialogs/weather-scenario/source-selection", "Live data" );
-      } else {
-        setprop("sim/gui/dialogs/weather-scenario/source-selection", "Manual input" );
-      }
-      setprop( "sim/gui/dialogs/weather-scenario/metar", normalize_string(getprop("environment/metar/data")) );
-
-
-      # fill the METAR source combo box
-      var combo = findElementByName( dlg_root, "source-selection" );
-      var wsn = props.globals.getNode( "/environment/weather-scenarios" );
-      if( wsn != nil ) {
-        var scenarios = wsn.getChildren("scenario");
-        forindex (var i; scenarios )
-          combo.getChild("value", i, 1).setValue(scenarios[i].getNode("name").getValue());
-      }
-
-      var apply = func {
-        var scenarioName = getprop("sim/gui/dialogs/weather-scenario/source-selection");
-        var metar = nil;
-        if( scenarioName == "Disabled" ) {
-          setprop( "/environment/params/metar-updates-environment", 0 );
-          setprop( "/environment/realwx/enabled", 0 );
-          metar = "";
-        } else if( scenarioName == "Live data" ) {
-          setprop( "/environment/params/metar-updates-environment", 1 );
-          setprop( "/environment/realwx/enabled", 1 );
-        } else {
-          setprop( "/environment/params/metar-updates-environment", 1 );
-          setprop( "/environment/realwx/enabled", 0 );
-          metar = getprop( "sim/gui/dialogs/weather-scenario/metar" );
-        }
-        if( metar != nil )
-          setprop( "environment/metar/data", normalize_string(metar) );
-      }
-
-    ]]></open>
-
-    <close><![CDATA[
-      removelistener( propertyChangeListener );
-      removelistener( metarListener );
-    ]]></close>
-  </nasal>
-</PropertyList>
+<?xml version="1.0"?>
+
+<PropertyList>
+
+  <!-- Control the weather -->
+  <name>weather</name>
+  <modal>false</modal>
+  <resizable>false</resizable>
+  <layout>vbox</layout>
+  <default-padding>3</default-padding>
+
+  <!-- Title bar with close button -->
+  <group>
+    <layout>hbox</layout>
+    <default-padding>1</default-padding>
+
+    <empty>
+      <stretch>true</stretch>
+    </empty>
+
+    <text>
+      <label>Global Troposphere Weather Conditions</label>
+    </text>
+
+    <empty>
+      <stretch>true</stretch>
+    </empty>
+
+    <button>
+      <legend/>
+      <key>Esc</key>
+      <pref-width>16</pref-width>
+      <pref-height>16</pref-height>
+      <border>2</border>
+      <binding>
+        <command>dialog-close</command>
+      </binding>
+    </button>
+  </group>
+  <hrule/>
+
+  <group>
+    <layout>hbox</layout>
+    <default-padding>0</default-padding>
+
+    <!-- Left Column -->
+    <group>
+      <layout>vbox</layout>
+      <group>
+        <layout>vbox</layout>
+        <default-padding>1</default-padding>
+
+        <!-- Cloud Layers -->
+        <group>
+          <layout>hbox</layout>
+          <text>
+            <label>Cloud Layers (All Altitudes ft-AMSL)</label>
+          </text>
+          <hrule>
+            <stretch>true</stretch>
+          </hrule>
+        </group>
+
+        <group>
+          <layout>hbox</layout>
+          <group>
+            <layout>table</layout>
+
+            <text>
+              <label>Altitude (ft)</label>
+              <row>0</row>
+              <col>1</col>
+            </text>
+
+            <text>
+              <label>Coverage</label>
+              <row>0</row>
+              <col>2</col>
+              <width>80</width>
+            </text>
+
+            <text>
+              <label>Thickness (ft)</label>
+              <row>0</row>
+              <col>3</col>
+            </text>
+
+
+            <!-- Layer 4 -->
+
+            <input>
+              <row>1</row>
+              <col>1</col>
+              <live>true</live>
+              <property>/environment/clouds/layer[4]/elevation-ft</property>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </input>
+
+            <combo>
+              <row>1</row>
+              <col>2</col>
+              <pref-width>100</pref-width>
+              <live>true</live>
+              <property>/environment/clouds/layer[4]/coverage</property>
+              <value>clear</value>
+              <value>few</value>
+              <value>scattered</value>
+              <value>broken</value>
+              <value>overcast</value>
+              <value>cirrus</value>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </combo>
+
+            <input>
+              <row>1</row>
+              <col>3</col>
+              <live>true</live>
+              <property>/environment/clouds/layer[4]/thickness-ft</property>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </input>
+
+
+            <!-- Layer 3 -->
+
+            <input>
+              <row>2</row>
+              <col>1</col>
+              <live>true</live>
+              <property>/environment/clouds/layer[3]/elevation-ft</property>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </input>
+
+            <combo>
+              <row>2</row>
+              <col>2</col>
+              <pref-width>100</pref-width>
+              <live>true</live>
+              <property>/environment/clouds/layer[3]/coverage</property>
+              <value>clear</value>
+              <value>few</value>
+              <value>scattered</value>
+              <value>broken</value>
+              <value>overcast</value>
+              <value>cirrus</value>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </combo>
+
+            <input>
+              <row>2</row>
+              <col>3</col>
+              <live>true</live>
+              <property>/environment/clouds/layer[3]/thickness-ft</property>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </input>
+
+
+            <!-- Layer 2 -->
+
+            <input>
+              <row>3</row>
+              <col>1</col>
+              <live>true</live>
+              <property>/environment/clouds/layer[2]/elevation-ft</property>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </input>
+
+            <combo>
+              <row>3</row>
+              <col>2</col>
+              <pref-width>100</pref-width>
+              <live>true</live>
+              <property>/environment/clouds/layer[2]/coverage</property>
+              <value>clear</value>
+              <value>few</value>
+              <value>scattered</value>
+              <value>broken</value>
+              <value>overcast</value>
+              <value>cirrus</value>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </combo>
+
+            <input>
+              <row>3</row>
+              <col>3</col>
+              <live>true</live>
+              <property>/environment/clouds/layer[2]/thickness-ft</property>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </input>
+
+
+            <!-- Layer 1 -->
+
+            <input>
+              <row>4</row>
+              <col>1</col>
+              <live>true</live>
+              <property>/environment/clouds/layer[1]/elevation-ft</property>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </input>
+
+            <combo>
+              <row>4</row>
+              <col>2</col>
+              <pref-width>100</pref-width>
+              <live>true</live>
+              <property>/environment/clouds/layer[1]/coverage</property>
+              <value>clear</value>
+              <value>few</value>
+              <value>scattered</value>
+              <value>broken</value>
+              <value>overcast</value>
+              <value>cirrus</value>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </combo>
+
+            <input>
+              <row>4</row>
+              <col>3</col>
+              <live>true</live>
+              <property>/environment/clouds/layer[1]/thickness-ft</property>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </input>
+
+
+            <!-- Layer 0 -->
+
+            <input>
+              <row>5</row>
+              <col>1</col>
+              <live>true</live>
+              <property>/environment/clouds/layer[0]/elevation-ft</property>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </input>
+
+            <combo>
+              <row>5</row>
+              <col>2</col>
+              <pref-width>100</pref-width>
+              <live>true</live>
+              <editable>false</editable>
+              <property>/environment/clouds/layer[0]/coverage</property>
+              <value>clear</value>
+              <value>few</value>
+              <value>scattered</value>
+              <value>broken</value>
+              <value>overcast</value>
+              <value>cirrus</value>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </combo>
+
+            <input>
+              <row>5</row>
+              <col>3</col>
+              <live>true</live>
+              <property>/environment/clouds/layer[0]/thickness-ft</property>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </input>
+
+          </group>
+          <empty>
+            <stretch>true</stretch>
+          </empty>
+        </group>
+      </group>
+      <!-- Cloud Layers End -->
+
+      <!-- Precipitation -->
+      <group>
+        <layout>vbox</layout>
+        <default-padding>1</default-padding>
+
+        <group>
+          <layout>hbox</layout>
+          <text>
+            <label>Precipitation</label>
+          </text>
+          <hrule>
+            <stretch>true</stretch>
+          </hrule>
+        </group>
+
+        <group>
+          <layout>hbox</layout>
+          <halign>fill</halign>
+          <group>
+            <layout>table</layout>
+            <text>
+              <row>0</row>
+              <col>0</col>
+              <label>Rain</label>
+            </text>
+
+            <text>
+              <row>0</row>
+              <col>1</col>
+              <label>Snow</label>
+            </text>
+
+            <slider>
+              <row>1</row>
+              <col>0</col>
+              <live>true</live>
+              <halign>fill</halign>
+              <property>/environment/metar/rain-norm</property>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <stretch>true</stretch>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </slider>
+
+            <slider>
+              <row>1</row>
+              <col>1</col>
+              <halign>fill</halign>
+              <property>/environment/metar/snow-norm</property>
+              <live>true</live>
+              <pref-height>30</pref-height>
+              <binding>
+                <command>dialog-apply</command>
+              </binding>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+            </slider>
+
+            <text>
+              <row>0</row>
+              <col>3</col>
+              <label>QNH (inHg)</label>
+            </text>
+
+            <input>
+              <name>pressure-sea-level-inhg</name>
+              <row>1</row>
+              <col>3</col>
+              <pref-width>50</pref-width>
+              <property>/environment/config/boundary/entry[0]/pressure-sea-level-inhg</property>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>pressure-sea-level-inhg</object-name>
+              </binding>
+            </input>
+
+            <empty>
+              <row>2</row>
+              <col>0</col>
+              <colspan>3</colspan>
+              <pref-height>30</pref-height>
+            </empty>
+
+          </group>
+
+          <empty>
+            <stretch>true</stretch>
+          </empty>
+        </group>
+      </group>
+      <!-- Precipitation End  -->
+    </group>
+    <!-- Left Column End -->
+
+    <vrule>
+      <stretch>true</stretch>
+    </vrule>
+
+    <!-- Right Column -->
+    <group>
+      <layout>vbox</layout>
+    
+      <!-- Aloft -->
+      <group>
+        <layout>vbox</layout>
+        <default-padding>1</default-padding>
+
+        <group>
+          <layout>hbox</layout>
+          <text>
+            <label>Aloft (All Altitudes ft-AMSL)</label>
+          </text>
+          <hrule>
+            <stretch>true</stretch>
+          </hrule>
+        </group>
+
+        <group>
+          <layout>hbox</layout>
+          <group>
+            <layout>table</layout>
+            <text>
+              <row>0</row>
+              <col>0</col>
+              <label>Altitude</label>
+            </text>
+
+            <text>
+              <row>0</row>
+              <col>1</col>
+              <colspan>2</colspan>
+              <label>Wind (dir/kt)</label>
+            </text>
+
+            <text>
+              <row>0</row>
+              <col>3</col>
+              <label>Vis (m)</label>
+            </text>
+
+            <text>
+              <row>0</row>
+              <col>4</col>
+              <label>Temp (C)</label>
+            </text>
+
+            <text>
+              <row>0</row>
+              <col>5</col>
+              <label>Dewpt (C)</label>
+            </text>
+
+            <input>
+              <name>aloft-4-elevation-ft</name>
+              <row>1</row>
+              <col>0</col>
+              <pref-width>52</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[4]/elevation-ft</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-4-elevation-ft</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-4-wind-from-heading-deg</name>
+              <row>1</row>
+              <col>1</col>
+              <pref-width>40</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[4]/wind-from-heading-deg</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-4-wind-from-heading-deg</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-4-wind-speed-kt</name>
+              <row>1</row>
+              <col>2</col>
+              <pref-width>35</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[4]/wind-speed-kt</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-4-wind-speed-kt</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-4-visibility-m</name>
+              <row>1</row>
+              <col>3</col>
+              <pref-width>55</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[4]/visibility-m</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-4-visibility-m</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-4-temperature-degc</name>
+              <row>1</row>
+              <col>4</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[4]/temperature-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-4-temperature-degc</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-4-dewpoint-degc</name>
+              <row>1</row>
+              <col>5</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[4]/dewpoint-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-4-dewpoint-degc</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-3-elevation-ft</name>
+              <row>2</row>
+              <col>0</col>
+              <pref-width>52</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[3]/elevation-ft</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-3-elevation-ft</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-3-wind-from-heading-deg</name>
+              <row>2</row>
+              <col>1</col>
+              <pref-width>40</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[3]/wind-from-heading-deg</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-3-wind-from-heading-deg</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-3-wind-speed-kt</name>
+              <row>2</row>
+              <col>2</col>
+              <pref-width>35</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[3]/wind-speed-kt</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-3-wind-speed-kt</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-3-visibility-m</name>
+              <row>2</row>
+              <col>3</col>
+              <pref-width>55</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[3]/visibility-m</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-3-visibility-m</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-3-temperature-degc</name>
+              <row>2</row>
+              <col>4</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[3]/temperature-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-3-temperature-degc</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-3-dewpoint-degc</name>
+              <row>2</row>
+              <col>5</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[3]/dewpoint-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-3-dewpoint-degc</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-2-elevation-ft</name>
+              <row>3</row>
+              <col>0</col>
+              <pref-width>52</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[2]/elevation-ft</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-2-elevation-ft</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-2-wind-from-heading-deg</name>
+              <row>3</row>
+              <col>1</col>
+              <pref-width>40</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[2]/wind-from-heading-deg</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-2-wind-from-heading-deg</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-2-wind-speed-kt</name>
+              <row>3</row>
+              <col>2</col>
+              <pref-width>35</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[2]/wind-speed-kt</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-2-wind-speed-kt</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-2-visibility-m</name>
+              <row>3</row>
+              <col>3</col>
+              <pref-width>55</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[2]/visibility-m</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-2-visibility-m</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-2-temperature-degc</name>
+              <row>3</row>
+              <col>4</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[2]/temperature-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-2-temperature-degc</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-2-dewpoint-degc</name>
+              <row>3</row>
+              <col>5</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[2]/dewpoint-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-2-dewpoint-degc</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-1-elevation-ft</name>
+              <row>4</row>
+              <col>0</col>
+              <pref-width>52</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[1]/elevation-ft</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-1-elevation-ft</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-1-wind-from-heading-deg</name>
+              <row>4</row>
+              <col>1</col>
+              <pref-width>40</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[1]/wind-from-heading-deg</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-1-wind-from-heading-deg</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-1-wind-speed-kt</name>
+              <row>4</row>
+              <col>2</col>
+              <pref-width>35</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[1]/wind-speed-kt</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-1-wind-speed-kt</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-1-visibility-m</name>
+              <row>4</row>
+              <col>3</col>
+              <pref-width>55</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[1]/visibility-m</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-1-visibility-m</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-1-temperature-degc</name>
+              <row>4</row>
+              <col>4</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[1]/temperature-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-1-temperature-degc</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-1-dewpoint-degc</name>
+              <row>4</row>
+              <col>5</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[1]/dewpoint-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-1-dewpoint-degc</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-0-elevation-ft</name>
+              <row>5</row>
+              <col>0</col>
+              <pref-width>52</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[0]/elevation-ft</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-0-elevation-ft</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-0-wind-from-heading-deg</name>
+              <row>5</row>
+              <col>1</col>
+              <pref-width>40</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[0]/wind-from-heading-deg</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-0-wind-from-heading-deg</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-0-wind-speed-kt</name>
+              <row>5</row>
+              <col>2</col>
+              <pref-width>35</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[0]/wind-speed-kt</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-0-wind-speed-kt</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-0-visibility-m</name>
+              <row>5</row>
+              <col>3</col>
+              <pref-width>55</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[0]/visibility-m</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-0-visibility-m</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-0-temperature-degc</name>
+              <row>5</row>
+              <col>4</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[0]/temperature-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-0-temperature-degc</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>aloft-0-dewpoint-degc</name>
+              <row>5</row>
+              <col>5</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/aloft/entry[0]/dewpoint-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>aloft-0-dewpoint-degc</object-name>
+              </binding>
+            </input>
+          </group>
+          <empty>
+            <stretch>true</stretch>
+          </empty>
+        </group>
+
+      </group>
+      <!-- Aloft End -->
+
+      <!-- Boundary  -->
+      <group>
+        <layout>vbox</layout>
+        <default-padding>1</default-padding>
+
+        <group>
+          <layout>hbox</layout>
+          <text>
+            <label>Boundary (All Elevations ft-AGL)</label>
+          </text>
+          <hrule>
+            <stretch>true</stretch>
+          </hrule>
+        </group>
+
+        <group>
+          <layout>hbox</layout>
+          <group>
+
+            <layout>table</layout>
+
+            <text>
+              <row>0</row>
+              <col>0</col>
+              <label>Elevation</label>
+            </text>
+
+            <text>
+              <row>0</row>
+              <col>1</col>
+              <colspan>2</colspan>
+              <label>Wind (dir/kt)</label>
+            </text>
+
+            <text>
+              <row>0</row>
+              <col>3</col>
+              <label>Vis (m)</label>
+            </text>
+
+            <text>
+              <row>0</row>
+              <col>4</col>
+              <label>Temp (C)</label>
+            </text>
+
+            <text>
+              <row>0</row>
+              <col>5</col>
+              <label>Dewpt (C)</label>
+            </text>
+
+            <input>
+              <name>boundary-1-elevation-ft</name>
+              <row>1</row>
+              <col>0</col>
+              <pref-width>52</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/boundary/entry[1]/elevation-ft</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>boundary-1-elevation-ft</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>boundary-1-wind-from-heading-deg</name>
+              <row>1</row>
+              <col>1</col>
+              <pref-width>40</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/boundary/entry[1]/wind-from-heading-deg</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>boundary-1-wind-from-heading-deg</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>boundary-1-wind-speed-kt</name>
+              <row>1</row>
+              <col>2</col>
+              <pref-width>35</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/boundary/entry[1]/wind-speed-kt</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>boundary-1-wind-speed-kt</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>boundary-1-visibility-m</name>
+              <row>1</row>
+              <col>3</col>
+              <pref-width>55</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/boundary/entry[1]/visibility-m</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>boundary-1-visibility-m</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>boundary-1-temperature-degc</name>
+              <row>1</row>
+              <col>4</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/boundary/entry[1]/temperature-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>boundary-1-temperature-degc</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>boundary-1-dewpoint-degc</name>
+              <row>1</row>
+              <col>5</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/boundary/entry[1]/dewpoint-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>boundary-1-dewpoint-degc</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>boundary-0-elevation-ft</name>
+              <row>2</row>
+              <col>0</col>
+              <pref-width>52</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/boundary/entry[0]/elevation-ft</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>boundary-0-elevation-ft</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>boundary-0-wind-from-heading-deg</name>
+              <row>2</row>
+              <col>1</col>
+              <pref-width>40</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/boundary/entry[0]/wind-from-heading-deg</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>boundary-0-wind-from-heading-deg</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>boundary-0-wind-speed-kt</name>
+              <row>2</row>
+              <col>2</col>
+              <pref-width>35</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/boundary/entry[0]/wind-speed-kt</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>boundary-0-wind-speed-kt</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>boundary-0-visibility-m</name>
+              <row>2</row>
+              <col>3</col>
+              <pref-width>55</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/boundary/entry[0]/visibility-m</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>boundary-0-visibility-m</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>boundary-0-temperature-degc</name>
+              <row>2</row>
+              <col>4</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/boundary/entry[0]/temperature-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>boundary-0-temperature-degc</object-name>
+              </binding>
+            </input>
+
+            <input>
+              <name>boundary-0-dewpoint-degc</name>
+              <row>2</row>
+              <col>5</col>
+              <pref-width>60</pref-width>
+              <enable>
+                <equals>
+                  <property>/sim/gui/dialogs/weather-scenario/state</property>
+                  <value type="int">1</value>
+                </equals>
+              </enable>
+              <property>/environment/config/boundary/entry[0]/dewpoint-degc</property>
+              <live>true</live>
+              <binding>
+                <command>dialog-apply</command>
+                <object-name>boundary-0-dewpoint-degc</object-name>
+              </binding>
+            </input>
+          </group>
+          <empty>
+            <stretch>true</stretch>
+          </empty>
+        </group>
+
+      </group>
+      <!-- Boundary  End -->
+    
+    </group>
+    <!-- Right Column -->
+
+  </group>
+
+  <group>
+    <layout>vbox</layout>
+
+    <!-- Automatic Weather -->
+    <group>
+      <layout>hbox</layout>
+      <text>
+        <label>Automatic Weather Generation</label>
+      </text>
+      <hrule>
+        <stretch>true</stretch>
+      </hrule>
+    </group>
+
+    <group>
+      <layout>hbox</layout>
+      <text>
+        <label>METAR Source</label>
+      </text>
+      <combo>
+        <name>source-selection</name>
+        <halign>fill</halign>
+        <stretch>true</stretch>
+        <property>sim/gui/dialogs/weather-scenario/source-selection</property>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>source-selection</object-name>
+        </binding>
+        <binding>
+          <command>dialog-update</command>
+          <object-name>metar</object-name>
+        </binding>
+      </combo>
+
+      <checkbox>
+        <name>metar-updates-winds-aloft</name>
+        <property>/environment/params/metar-updates-winds-aloft</property>
+        <label>Update winds aloft</label>
+        <live>true</live>
+        <binding>
+          <command>dialog-apply</command>
+          <object-name>metar-updates-winds-aloft</object-name>
+        </binding>
+      </checkbox>
+
+    </group>
+
+    <textbox>
+      <name>description</name>
+      <halign>fill</halign>
+      <stretch>true</stretch>
+      <pref-width>180</pref-width>
+      <pref-height>60</pref-height>
+      <slider>20</slider>
+      <editable>false</editable>
+      <wrap>true</wrap>
+      <live>true</live>
+      <property>sim/gui/dialogs/weather-scenario/description</property>
+    </textbox>
+
+    <group>
+      <layout>hbox</layout>
+      <text>
+        <label>METAR Data</label>
+      </text>
+      <empty>
+        <stretch>true</stretch>
+      </empty>
+      <checkbox>
+        <property>/environment/metar/valid</property>
+        <label>valid</label>
+        <live>true</live>
+        <editable>false</editable>
+      </checkbox>
+    </group>
+
+    <textbox>
+      <name>metar</name>
+      <halign>fill</halign>
+      <stretch>true</stretch>
+      <pref-width>180</pref-width>
+      <pref-height>50</pref-height>
+      <slider>20</slider>
+      <editable>true</editable>
+      <wrap>true</wrap>
+      <live>false</live>
+      <property>sim/gui/dialogs/weather-scenario/metar</property>
+      <enable>
+	<equals>
+	  <property>/sim/gui/dialogs/weather-scenario/state</property>
+	  <value type="int">1</value>
+	</equals>
+      </enable>
+    </textbox>
+
+    <!-- Automatic Weather -->
+    
+  </group>
+
+  <nasal>
+    <open><![CDATA[
+        var normalize_string = func(src) {
+          if( src == nil ) src = "";
+          var dst = "";
+          for( var i = 0; i < size(src); i+=1 ) {
+            if( src[i] == `\n` or src[i] == `\r` )
+              src[i] = ` `;
+
+            if( i != 0 and src[i] == ` ` and src[i-1] == ` ` )
+              continue;
+
+            dst = dst ~ " ";
+            dst[size(dst)-1] = src[i];
+          }
+          return dst;
+        }
+
+      var GlobalWeatherDialogController = {
+
+        new : func( dlgRoot ) {
+          var obj = { parents: [GlobalWeatherDialogController] };
+          obj.dlgRoot = dlgRoot;
+          obj.base = "sim/gui/dialogs/weather-scenario";
+          obj.baseN = props.globals.getNode( obj.base, 1 );
+
+          return obj;
+        },
+
+        open : func {
+          #initialize the METAR source selection
+          if( getprop( "environment/params/metar-updates-environment" ) == 0 ) {
+            setprop( me.base ~ "/source-selection", "Disabled" );
+          } else if( getprop( "environment/realwx/enabled" ) ) {
+            setprop( me.base ~ "/source-selection", "Live data" );
+          } else {
+            setprop( me.base ~ "/source-selection", "Manual input" );
+          }
+          setprop( me.base ~ "/metar", normalize_string(getprop("environment/metar/data")) );
+
+
+          # fill the METAR source combo box
+          var combo = me.findElementByName( me.dlgRoot, "source-selection" );
+          var wsn = props.globals.getNode( "/environment/weather-scenarios" );
+          if( wsn != nil ) {
+            var scenarios = wsn.getChildren("scenario");
+            forindex (var i; scenarios )
+              combo.getChild("value", i, 1).setValue(scenarios[i].getNode("name").getValue());
+          }
+
+          me.scenarioListenerId = setlistener( me.base ~ "/source-selection", func(n) { me.scenarioListener(n); } );
+          me.metarListenerId = setlistener( "environment/metar/valid", func(n) { me.metarListener(n); }, 1, 0 );
+        },
+
+        close : func {
+          removelistener( me.scenarioListenerId );
+          removelistener( me.metarListenerId );
+        },
+
+        stateChange : func {
+          var scenarioName = getprop( me.base ~ "/source-selection");
+          var metar = nil;
+          if( scenarioName == "Disabled" ) {
+            setprop( "/environment/params/metar-updates-environment", 0 );
+            setprop( "/environment/realwx/enabled", 0 );
+            setprop( "/environment/config/enabled", 0 );
+            me.baseN.getNode("state",1).setIntValue( 1 );
+            metar = "";
+          } else if( scenarioName == "Live data" ) {
+            setprop( "/environment/params/metar-updates-environment", 1 );
+            setprop( "/environment/realwx/enabled", 1 );
+            setprop( "/environment/config/enabled", 1 );
+            me.baseN.getNode("state",1).setIntValue( 0 );
+          } else {
+            setprop( "/environment/params/metar-updates-environment", 1 );
+            setprop( "/environment/realwx/enabled", 0 );
+            setprop( "/environment/config/enabled", 1 );
+            metar = getprop( me.base ~ "/metar" );
+            me.baseN.getNode("state",1).setIntValue( 0 );
+          }
+          if( metar != nil )
+            setprop( "environment/metar/data", normalize_string(metar) );
+        },
+
+        findScenarioByName : func(name) {
+          var wsn = props.globals.getNode( "/environment/weather-scenarios" );
+          if( wsn != nil ) {
+            var scenarios = wsn.getChildren("scenario");
+            foreach (var scenario; scenarios ) {
+              if( scenario.getNode("name").getValue() == name )
+                return scenario;
+            }
+          }
+          return nil;
+        },
+
+        findElementByName : func(base,name) {
+          foreach( var child; base.getChildren() ) {
+            var n = child.getNode( "name" );
+            if( n != nil and n.getValue() == name )
+              return child;
+            var f = me.findElementByName(child,name);
+            if( f != nil ) return f;
+          }
+          return nil;
+        },
+
+        scenarioListener : func( n ) {
+          description = "";
+          metar = "nil";
+          var scenario = me.findScenarioByName( n.getValue() );
+          if( scenario != nil ) {
+            description = normalize_string(scenario.getNode("description", 1 ).getValue());
+            metar = normalize_string(scenario.getNode("metar", 1 ).getValue());
+          }
+          setprop(me.base ~ "/description", description );
+          setprop(me.base ~ "/metar", metar );
+          me.stateChange();
+        },
+
+        metarListener : func( n ) {
+          var metar = getprop("environment/metar/data");
+          if( metar == nil or metar == "" ) metar = "NIL";
+          metar = normalize_string(metar);
+          setprop( me.base ~ "/metar", metar );
+          gui.dialog_update( "weather", "metar" );
+        },
+
+      };
+
+      var controller = GlobalWeatherDialogController.new( cmdarg() );
+      controller.open();
+    ]]></open>
+
+    <close><![CDATA[
+      controller.close();
+    ]]></close>
+  </nasal>
+</PropertyList>
diff --git a/gui/menubar.xml b/gui/menubar.xml
index 8126aa4ea..d13b2877c 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -1,10 +1,11 @@
+<?xml version="1.0"?>
 <PropertyList>
 
 	<menu>
 		<label>File</label>
-
+<!--
 		<item>
-			<label>Load</label>
+			<label>Load Flight    (Shift-F1)</label>
 			<binding>
 				<command>nasal</command>
 				<script>gui.load_flight()</script>
@@ -12,33 +13,51 @@
 		</item>
 
 		<item>
-			<label>Save</label>
+			<label>Save Flight    (Shift-F2)</label>
 			<binding>
 				<command>nasal</command>
 				<script>gui.save_flight()</script>
 			</binding>
 		</item>
-
+		
 		<item>
-			<label>Reset</label>
+            <label>Scenario</label>
+			<binding>
+                <command>dialog-show</command>
+                <dialog-name>scenario</dialog-name>
+            </binding>
+        </item>
+-->
+		<item>
+			<label>Reset           (Shift-Esc)</label>
 			<binding>
 				<command>reset</command>
 			</binding>
 		</item>
 
-		<item>
+		<!--		<item>
+            <label>Set Lat/Lon Format</label>
+            <binding>
+                <command>nasal</command>
+                <script>
+                    var f = getprop(var d = "/sim/lon-lat-format") + 1;
+                    setprop(d, f &lt; 0 ? 0 : f > 2 ? 0 : f);
+                </script>
+            </binding>
+        </item>  
 			<label>High-Res Snapshot</label>
 			<enabled>false</enabled>
 			<binding>
 				<command>hires-screen-capture</command>
 			</binding>
 		</item>
-
+-->
 		<item>
-			<label>Snapshot</label>
+			<label>Screenshot             (F3)</label>
 			<binding>
 				<command>nasal</command>
 				<script>
+					gui.popdown();
 					var success = fgcommand("screen-capture");
 					var path = getprop("/sim/paths/screenshot-last");
 					if (success)
@@ -48,14 +67,27 @@
 				</script>
 			</binding>
 		</item>
+		<!--
+		<item>
+        <label>Last snapshot</label>
+			<binding>
+                <command>nasal</command>
+                <script>
+                    var path = getprop("/sim/paths/screenshot-last");
+                    if (path != nil) gui.popupTip(...) else gui.popupTip("no screenshots yet in this session")
+
+                    gui.popupTip("Screenshot written to '" ~ path ~ "'");
+                </script>
+			</binding>
+		</item>
 
 		<item>
-			<label>Print Screen</label>
+			<label>Print Screen         (F3)</label>
 			<binding>
 				<command>old-print-dialog</command>
 			</binding>
 		</item>
-
+-->
 		<item>
 			<label>Sound Configuration</label>
 			<binding>
@@ -65,23 +97,7 @@
 		</item>
 
 		<item>
-			<label>Browse Internal Properties</label>
-			<binding>
-				<command>nasal</command>
-				<script>gui.property_browser()</script>
-			</binding>
-		</item>
-
-		<item>
-			<label>Logging</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>logging</dialog-name>
-			</binding>
-		</item>
-
-		<item>
-			<label>Quit</label>
+			<label>Quit                    (Esc)</label>
 			<binding>
 				<command>dialog-show</command>
 				<dialog-name>exit</dialog-name>
@@ -109,6 +125,16 @@
 		</item>
 
 		<item>
+			<!--      <item>
+            <label>Set Lat/Lon Format</label>
+            <binding>
+                <command>nasal</command>
+                <script>
+                    var f = getprop(var d = "/sim/lon-lat-format") + 1;
+                    setprop(d, f &lt; 0 ? 0 : f > 2 ? 0 : f);
+                </script>
+            </binding>
+        </item>   -->
 			<label>View Options</label>
 			<binding>
 				<command>dialog-show</command>
@@ -124,6 +150,14 @@
 			</binding>
 		</item>
 
+		<item>
+			<label>Adjust LOD Ranges</label>
+			<binding>
+				<command>dialog-show</command>
+				<dialog-name>static-lod</dialog-name>
+			</binding>
+		</item>
+
 		<item>
 			<label>Adjust View Position</label>
 			<binding>
@@ -141,7 +175,19 @@
 		</item>
 
 		<item>
-			<label>Instant Replay</label>
+			<label>Toggle Glide Slope Tunnel</label>
+			<binding>
+				<command>nasal</command>
+				<script>
+					var p = "/sim/rendering/glide-slope-tunnel";
+					setprop(p, var i = !getprop(p));
+					gui.popupTip("Glide slope tunnel " ~ (i ? "enabled" : "disabled"));
+				</script>
+			</binding>
+		</item>
+
+		<item>
+			<label>Instant Replay   (Ctrl-R)</label>
 			<binding>
 				<command>dialog-show</command>
 				<dialog-name>replay</dialog-name>
@@ -149,18 +195,10 @@
 		</item>
 
 		<item>
-			<label>Adjust LOD Ranges</label>
+			<label>Stereoscopic View Options</label>
 			<binding>
 				<command>dialog-show</command>
-				<dialog-name>static-lod</dialog-name>
-			</binding>
-		</item>
-
-		<item>
-			<label>OSG Display Settings</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>osg-display-settings</dialog-name>
+				<dialog-name>stereoscopic-view-options</dialog-name>
 			</binding>
 		</item>
 	</menu>
@@ -193,7 +231,7 @@
 		</item>
 
 		<item>
-			<label>Random Attitude</label>
+			<label>Random Attitude</label>H
 			<binding>
 				<command>property-assign</command>
 				<property>/sim/presets/trim</property>
@@ -234,7 +272,7 @@
 		<name>autopilot</name>
 
 		<item>
-			<label>Autopilot Settings</label>
+			<label>Autopilot Settings (F11)</label>
 			<binding>
 				<command>dialog-show</command>
 				<dialog-name>autopilot</dialog-name>
@@ -249,45 +287,42 @@
 			</binding>
 		</item>
 
-        <item>
+		<item>
 			<label>Previous Waypoint</label>
 			<binding>
 				<command>nasal</command>
 				<script>setprop("/autopilot/route-manager/input", "@previous")</script>
 			</binding>
 		</item>
-		
-        <item>
+
+		<item>
 			<label>Next Waypoint</label>
 			<binding>
 				<command>nasal</command>
 				<script>setprop("/autopilot/route-manager/input", "@next")</script>
 			</binding>
 		</item>
-
-		<item>
-			<label>Set Lat/Lon Format</label>
-			<binding>
-				<command>nasal</command>
-				<script>
-					var f = getprop(var d = "/sim/lon-lat-format") + 1;
-					setprop(d, f &lt; 0 ? 0 : f > 2 ? 0 : f);
-				</script>
-			</binding>
-		</item>
-		
-		<item>
-			<label>Map</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>map</dialog-name>
-			</binding>
-		</item>
 	</menu>
 
 	<menu>
 		<label>Environment</label>
 
+		<!--<item>
+			<label>Weather Scenario</label>
+			<binding>
+				<command>dialog-show</command>
+				<dialog-name>weather_scenario</dialog-name>
+			</binding>
+		</item>
+
+		<item>
+			<label>Weather Conditions</label>
+			<binding>
+				<command>dialog-show</command>
+				<dialog-name>weather</dialog-name>
+			</binding>
+		</item>-->
+
 		<item>
 			<label>Global Weather</label>
 			<binding>
@@ -296,23 +331,31 @@
 			</binding>
 		</item>
 
-	  <item>
-	    <label>Local Weather</label>
-	    <binding>
-	      <command>dialog-show</command>
-	      <dialog-name>local_weather</dialog-name>
-	    </binding>
-	  </item>
-	  
-	  <item>
-	    <label>Local Weather Tiles</label>
-	    <binding>
-	      <command>dialog-show</command>
-	      <dialog-name>local_weather_tiles</dialog-name>
-	    </binding>
-	  </item>
-	  
-	  <item>
+		<item>
+			<label>Local Weather</label>
+			<binding>
+				<command>dialog-show</command>
+				<dialog-name>local_weather</dialog-name>
+			</binding>
+		</item>
+
+		<item>
+			<label>Local Weather Tiles</label>
+			<binding>
+				<command>dialog-show</command>
+				<dialog-name>local_weather_tiles</dialog-name>
+			</binding>
+		</item>
+
+		<item>
+			<label>Local Weather Config</label>
+			<binding>
+				<command>dialog-show</command>
+				<dialog-name>local_weather_config</dialog-name>
+			</binding>
+		</item>
+
+		<item>
 			<label>Time Settings</label>
 			<binding>
 				<command>dialog-show</command>
@@ -333,6 +376,22 @@
 	<menu>
 		<label>Equipment</label>
 
+		<item>
+			<label>Map</label>
+			<binding>
+				<command>dialog-show</command>
+				<dialog-name>map</dialog-name>
+			</binding>
+		</item>
+
+		<item>
+			<label>Stopwatch</label>
+			<binding>
+				<command>dialog-show</command>
+				<dialog-name>stopwatch-dialog</dialog-name>
+			</binding>
+		</item>
+
 		<item>
 			<label>Fuel and Payload</label>
 			<name>fuel-and-payload</name>
@@ -343,7 +402,7 @@
 		</item>
 
 		<item>
-			<label>Radio Settings</label>
+			<label>Radio Settings (F12)</label>
 			<binding>
 				<command>dialog-show</command>
 				<dialog-name>radios</dialog-name>
@@ -366,12 +425,10 @@
 			</binding>
 		</item>
 
+
+
 		<item>
-			<label>Stopwatch</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>stopwatch-dialog</dialog-name>
-			</binding>
+			<label> --- Failures ---</label>
 		</item>
 
 		<item>
@@ -401,24 +458,32 @@
 
 	<menu>
 		<label>ATC/AI</label>
-
 		<item>
-			<label>Frequencies</label>
+			<label>ATC Options</label>
+			<binding>
+				<command>dialog-show</command>
+				<dialog-name>ai</dialog-name>
+			</binding>
+		</item>
+		<!--  Not working at present        
+		<item>
+			<label>ATC Services in range</label>
 			<binding>
 				<command>ATC-freq-search</command>
 			</binding>
 		</item>
 
+		-->
 		<item>
-			<label>Options</label>
+			<label>AI Formation</label>
 			<binding>
 				<command>dialog-show</command>
-				<dialog-name>atc-ai</dialog-name>
+				<dialog-name>formation</dialog-name>
 			</binding>
 		</item>
 
 		<item>
-			<label>Tanker</label>
+			<label>AI Tanker</label>
 			<name>tanker</name>
 			<enabled>false</enabled>
 			<binding>
@@ -428,20 +493,31 @@
 		</item>
 
 		<item>
-			<label>Scenario</label>
+			<label>AI Carrier Options</label>
+			<binding>
+				<command>dialog-show</command>
+				<dialog-name>AIcarrier</dialog-name>
+			</binding>
+		</item>
+
+		<item>
+			<label>AI Scenario Select - takes effect on next run </label>
 			<binding>
 				<command>dialog-show</command>
 				<dialog-name>scenario</dialog-name>
 			</binding>
 		</item>
+
+
+
 	</menu>
 
 	<menu>
-		<label>Network</label>
+		<label>Multiplayer</label>
 		<name>multiplayer</name>
 
 		<item>
-			<label>Chat</label>
+			<label>Chat Dialog</label>
 			<binding>
 				<command>dialog-show</command>
 				<dialog-name>chat-full</dialog-name>
@@ -470,13 +546,15 @@
 				<command>nasal</command>
 				<script>
 					if (contains(globals, "MPCarriers")) {
-						MPCarriers.carrier_dialog.show();
+					MPCarriers.carrier_dialog.show();
 					} else {
-						gui.popupTip("No MPCarriers around at the moment.");
+					gui.popupTip("No MPCarriers around at the moment.");
 					}
 				</script>
 			</binding>
 		</item>
+
+
 	</menu>
 
 	<menu>
@@ -513,13 +591,13 @@
 			</binding>
 		</item>
 
-                <item>
-                        <label>Reload Network</label>
-                        <binding>
-                                <command>reinit</command>
-                                <subsystem>io</subsystem>
-                        </binding>
-                </item>
+		<item>
+			<label>Reload Network</label>
+			<binding>
+				<command>reinit</command>
+				<subsystem>io</subsystem>
+			</binding>
+		</item>
 
 		<item>
 			<label>Nasal Console</label>
@@ -577,20 +655,32 @@
 				<step type="int">1</step>
 			</binding>
 		</item>
+
+		<item>
+			<label>Browse Internal Properties</label>
+			<binding>
+				<command>nasal</command>
+				<script>gui.property_browser()</script>
+			</binding>
+		</item>
+
+		<item>
+			<label>Logging</label>
+			<binding>
+				<command>dialog-show</command>
+				<dialog-name>logging</dialog-name>
+			</binding>
+		</item>
+
 	</menu>
 
+
 	<menu>
 		<label>Help</label>
 
+
 		<item>
-			<label>About</label>
-			<binding>
-				<command>dialog-show</command>
-				<dialog-name>about</dialog-name>
-			</binding>
-		</item>
-		<item>
-			<label>Help</label>
+			<label>Help (opens in browser)</label>
 			<binding>
 				<command>old-help-dialog</command>
 			</binding>
@@ -606,7 +696,11 @@
 		</item>
 
 		<item>
-			<label>Basic Keys</label>
+			<label> --- Key Reference ---</label>
+		</item>
+
+		<item>
+			<label>Basic Simulator Keys</label>
 			<binding>
 				<command>nasal</command>
 				<script>gui.showHelpDialog("/sim/help/basic")</script>
@@ -622,7 +716,7 @@
 		</item>
 
 		<item>
-			<label>Aircraft Help</label>
+			<label> Current Aircraft Keys           (?)</label>
 			<binding>
 				<command>nasal</command>
 				<script>gui.showHelpDialog("/sim/help")</script>
@@ -630,15 +724,7 @@
 		</item>
 
 		<item>
-			<label>Toggle Glide Slope Tunnel</label>
-			<binding>
-				<command>nasal</command>
-				<script>
-					var p = "/sim/rendering/glide-slope-tunnel";
-					setprop(p, var i = !getprop(p));
-					gui.popupTip("Glide slope tunnel " ~ (i ? "enabled" : "disabled"));
-				</script>
-			</binding>
+			<label> ---------------------</label>
 		</item>
 
 		<item>
@@ -659,6 +745,14 @@
 				<script>tutorial.stopTutorial()</script>
 			</binding>
 		</item>
+
+		<item>
+			<label>About</label>
+			<binding>
+				<command>dialog-show</command>
+				<dialog-name>about</dialog-name>
+			</binding>
+		</item>
 	</menu>
 
 </PropertyList>
diff --git a/keyboard.xml b/keyboard.xml
index e4010ac4d..d61f3d731 100644
--- a/keyboard.xml
+++ b/keyboard.xml
@@ -272,7 +272,7 @@ top down before the key bindings are parsed.
 
  <key n="32">
   <name>SPACE</name>
-  <desc>PTT - Push To Talk (via VoIP)</desc>
+  <desc>PTT - Push To Talk (via FGCom)</desc>
   <binding>
    <command>nasal</command>
    <script>space(1, modifiers.getValue())</script>
diff --git a/preferences.xml b/preferences.xml
index 5a01e6347..df1e8b200 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -148,6 +148,7 @@ Started September 2000 by David Megginson, david@megginson.com
    </headshake>
    <crop-shader userarchive="y">0</crop-shader>
    <landmass-shader userarchive="y">0</landmass-shader>
+   <transition-shader userarchive="y">0</transition-shader>
    <water-shader userarchive="y">0</water-shader>
    <urban-shader userarchive="y">0</urban-shader>
    <contrail-shader userarchive="y">0</contrail-shader>
@@ -290,6 +291,14 @@ Started September 2000 by David Megginson, david@megginson.com
    <autopilot>
     <path>Aircraft/Generic/generic-autopilot-helper.xml</path>
    </autopilot>
+   <property-rule>
+     <name>Environment METAR Interpolation Rule</name>
+     <path>Environment/metarinterpolator.xml</path>
+   </property-rule>
+   <property-rule>
+     <name>Environment Interpolation Rule</name>
+     <path>Environment/interpolator.xml</path>
+   </property-rule>
   </systems>
   <instrumentation>
    <path>Aircraft/Generic/generic-instrumentation.xml</path>