diff --git a/ATC/atis/eddh.xml b/ATC/atis/eddh.xml
index 704f6e05d..96729a7ad 100644
--- a/ATC/atis/eddh.xml
+++ b/ATC/atis/eddh.xml
@@ -47,7 +47,7 @@
     <token>wind-dir</token>
     <text> degrees </text>
     <token>wind-speed-kn</token>
-    <text> knots </text>
+    <text> knots</text>
     <if>
       <not-empty>
         <token>gusts</token>
@@ -55,7 +55,20 @@
       <then>
         <text> gusts up to </text>
         <token>gusts</token>
-        <text> knots </text>
+        <text> knots</text>
+      </then>
+    </if>
+    <if>
+      <not-equals>
+        <token>wind-from</token>
+        <token>wind-to</token>
+      </not-equals>
+      <then>
+        <text> varying between </text>
+        <token>wind-from</token>
+        <text> and </text>
+        <token>wind-to</token>
+        <text> degrees</text>
       </then>
     </if>
     <text>. </text>
diff --git a/Docs/README.Joystick.html b/Docs/README.Joystick.html
index 25e7f885c..f357dab7d 100644
--- a/Docs/README.Joystick.html
+++ b/Docs/README.Joystick.html
@@ -608,10 +608,24 @@ Here's an example of how to use an axis to adjust the elevator trim:
 If you want you can specify a time interval for processing digital hat repeats.  For example 
 if you want an interval of 0.05 seconds, which will effect up to 20 repeats per second, then add 
 the following to the property:
+</p>
 <PRE>
   --prop:/input/joysticks/js/axis[1]/interval-sec=0.05
 </PRE>
 <br>
+<p>
+If you want specify a delay time before interval repeats action.  For example 
+if you want an interval of 0.05 seconds after 1 second the axis has been pressed, then add 
+the following to the property:
+</p>
+<PRE>
+  --prop:/input/joysticks/js/axis[1]/delay-sec=1
+  --prop:/input/joysticks/js/axis[1]/interval-sec=0.05
+</PRE>
+<p>
+Similarly, release-delay-sec is how long to wait after releasing the button.
+</p>
+<br>
 <P>
 You could also bind some axes to brakes, so that you can use positions
 between between 0.0 (no brakes) and 1.0 (full brakes).
diff --git a/Nasal/aircraft.nas b/Nasal/aircraft.nas
index 581dbf795..8d28b1a2f 100644
--- a/Nasal/aircraft.nas
+++ b/Nasal/aircraft.nas
@@ -1002,7 +1002,7 @@ var teleport = func(airport = "", runway = "", lat = -9999, lon = -9999, alt = 0
 	setprop("/sim/presets/offset-azimuth-nm", azimuth);
 	setprop("/sim/presets/glideslope-deg", glideslope);
 	setprop("/sim/presets/heading-deg", heading);
-	fgcommand("presets-commit");
+	fgcommand("reposition");
 }
 
 
diff --git a/Nasal/gui.nas b/Nasal/gui.nas
index f3d25a753..65b160c96 100644
--- a/Nasal/gui.nas
+++ b/Nasal/gui.nas
@@ -597,7 +597,7 @@ var load_flight_sel = nil;
 var load_flight = func {
     var load = func(n) {
         fgcommand("load", props.Node.new({ file: n.getValue() }));
-        fgcommand("presets-commit");
+        fgcommand("reposition");
     }
     if (load_flight_sel == nil)
         load_flight_sel = FileSelector.new(load, "Load Flight", "Load",
diff --git a/Nasal/tutorial/tutorial.nas b/Nasal/tutorial/tutorial.nas
index 4c50659b8..e4604cb62 100644
--- a/Nasal/tutorial/tutorial.nas
+++ b/Nasal/tutorial/tutorial.nas
@@ -85,7 +85,7 @@ var startTutorial = func {
 	var presets = tutorialN.getChild("presets");
 	if (presets != nil) {
 		props.copy(presets, props.globals.getNode("/sim/presets"));
-		fgcommand("presets-commit");
+		fgcommand("reposition");
 
 		if (getprop("/sim/presets/on-ground")) {
 			var eng = props.globals.getNode("/controls/engines");
@@ -104,7 +104,7 @@ var startTutorial = func {
 
 	# <init>
 	do_group(tutorialN.getNode("init"));
-	is_running(1);  # needs to be after "presets-commit"
+	is_running(1);  # needs to be after "reposition"
 	display.clear();
 	display.show();
 
diff --git a/gui/dialogs/airports.xml b/gui/dialogs/airports.xml
index 635344c21..e4a324c9f 100644
--- a/gui/dialogs/airports.xml
+++ b/gui/dialogs/airports.xml
@@ -1434,7 +1434,7 @@
           <script>apply()</script>
         </binding>
         <binding>
-          <command>presets-commit</command>
+          <command>reposition</command>
         </binding>
         <binding>
           <command>dialog-close</command>
diff --git a/gui/dialogs/location-in-air.xml b/gui/dialogs/location-in-air.xml
index 64d4c879d..e8329d41e 100644
--- a/gui/dialogs/location-in-air.xml
+++ b/gui/dialogs/location-in-air.xml
@@ -363,7 +363,7 @@
         </script>
       </binding>
       <binding>
-        <command>presets-commit</command>
+        <command>reposition</command>
       </binding>
       <binding>
         <command>nasal</command>
diff --git a/gui/dialogs/seaport.xml b/gui/dialogs/seaport.xml
index 08fab29ef..cb62fcb06 100644
--- a/gui/dialogs/seaport.xml
+++ b/gui/dialogs/seaport.xml
@@ -69,7 +69,7 @@
 			var teleport = func(lat, lon) {
 				setprop("/sim/presets/latitude-deg", lat);
 				setprop("/sim/presets/longitude-deg", lon);
-				fgcommand("presets-commit");
+				fgcommand("reposition");
 			}
 
 			var on_water = func(lat, lon) {