diff --git a/configs/sim/gmoccapy/6_axis.ini b/configs/sim/gmoccapy/6_axis.ini
index 4a1a0179f8c..4f5432bd19a 100644
--- a/configs/sim/gmoccapy/6_axis.ini
+++ b/configs/sim/gmoccapy/6_axis.ini
@@ -1,6 +1,6 @@
 [EMC]
 VERSION = 1.1
-MACHINE = gmoccapy_9_axis
+MACHINE = gmoccapy_6_axis
   DEBUG = 0
 
 [DISPLAY]
@@ -15,10 +15,12 @@ GEOMETRY = XYZABC
 
 # Values that will be allowed for override, 1.0 = 100%
 MAX_FEED_OVERRIDE    =  1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE =  0.5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE =  0.5
 
-DEFAULT_SPINDLE_SPEED = 500
+# The value will be used the first time Gmoccapy is loaded.
+# It will then be overwritten by the *.pref file.
+DEFAULT_SPINDLE_0_SPEED = 500
 
 # list of selectable jog increments
 INCREMENTS = 1.000 mm, 0.100 mm, 0.010 mm, 0.001 mm ,1.2345 in
diff --git a/configs/sim/gmoccapy/7_axis.ini b/configs/sim/gmoccapy/7_axis.ini
index e5d25e7fddb..ec8fcefbc35 100644
--- a/configs/sim/gmoccapy/7_axis.ini
+++ b/configs/sim/gmoccapy/7_axis.ini
@@ -1,6 +1,6 @@
 [EMC]
 VERSION = 1.1
-MACHINE = gmoccapy_9_axis
+MACHINE = gmoccapy_7_axis
   DEBUG = 0
 
 [DISPLAY]
@@ -15,10 +15,12 @@ GEOMETRY = XYZABCUVW
 
 # Values that will be allowed for override, 1.0 = 100%
 MAX_FEED_OVERRIDE    =  1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE =  0.5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE =  0.5
 
-DEFAULT_SPINDLE_SPEED = 500
+# The value will be used the first time Gmoccapy is loaded.
+# It will then be overwritten by the *.pref file.
+DEFAULT_SPINDLE_0_SPEED = 500
 
 # list of selectable jog increments
 INCREMENTS = 1.000 mm, 0.100 mm, 0.010 mm, 0.001 mm ,1.2345 in
diff --git a/configs/sim/gmoccapy/7_axis_tool.ini b/configs/sim/gmoccapy/7_axis_tool.ini
index 62c9b2578a3..c149984be35 100644
--- a/configs/sim/gmoccapy/7_axis_tool.ini
+++ b/configs/sim/gmoccapy/7_axis_tool.ini
@@ -1,6 +1,6 @@
 [EMC]
 VERSION = 1.1
-MACHINE = gmoccapy_9_axis
+MACHINE = gmoccapy_7_axis_tool
   DEBUG = 0
 
 [DISPLAY]
@@ -15,10 +15,12 @@ GEOMETRY = XYZABCUVW
 
 # Values that will be allowed for override, 1.0 = 100%
 MAX_FEED_OVERRIDE    =  1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE =  0.5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE =  0.5
 
-DEFAULT_SPINDLE_SPEED = 500
+# The value will be used the first time Gmoccapy is loaded.
+# It will then be overwritten by the *.pref file.
+DEFAULT_SPINDLE_0_SPEED = 500
 
 # list of selectable jog increments
 INCREMENTS = 1.000 mm, 0.100 mm, 0.010 mm, 0.001 mm ,1.2345 in
diff --git a/configs/sim/gmoccapy/8_axis.ini b/configs/sim/gmoccapy/8_axis.ini
index bbfd5b65dde..8244dffd683 100644
--- a/configs/sim/gmoccapy/8_axis.ini
+++ b/configs/sim/gmoccapy/8_axis.ini
@@ -1,6 +1,6 @@
 [EMC]
 VERSION = 1.1
-MACHINE = gmoccapy_9_axis
+MACHINE = gmoccapy_8_axis
   DEBUG = 0
 
 [DISPLAY]
@@ -15,10 +15,12 @@ GEOMETRY = XYZABCUVW
 
 # Values that will be allowed for override, 1.0 = 100%
 MAX_FEED_OVERRIDE    =  1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE =  0.5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE =  0.5
 
-DEFAULT_SPINDLE_SPEED = 500
+# The value will be used the first time Gmoccapy is loaded.
+# It will then be overwritten by the *.pref file.
+DEFAULT_SPINDLE_0_SPEED = 500
 
 # list of selectable jog increments
 INCREMENTS = 1.000 mm, 0.100 mm, 0.010 mm, 0.001 mm ,1.2345 in
diff --git a/configs/sim/gmoccapy/9_axis.ini b/configs/sim/gmoccapy/9_axis.ini
index 33fac9bce8d..6ccfb7b41bf 100644
--- a/configs/sim/gmoccapy/9_axis.ini
+++ b/configs/sim/gmoccapy/9_axis.ini
@@ -15,10 +15,12 @@ GEOMETRY = XYZABCUVW
 
 # Values that will be allowed for override, 1.0 = 100%
 MAX_FEED_OVERRIDE    =  1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE =  0.5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE =  0.5
 
-DEFAULT_SPINDLE_SPEED = 500
+# The value will be used the first time Gmoccapy is loaded.
+# It will then be overwritten by the *.pref file.
+DEFAULT_SPINDLE_0_SPEED = 500
 
 # list of selectable jog increments
 INCREMENTS = 1.000 mm, 0.100 mm, 0.010 mm, 0.001 mm ,1.2345 in
diff --git a/configs/sim/gmoccapy/gmoccapy.ini b/configs/sim/gmoccapy/gmoccapy.ini
index 9aa8a90074e..a16be37b0a0 100644
--- a/configs/sim/gmoccapy/gmoccapy.ini
+++ b/configs/sim/gmoccapy/gmoccapy.ini
@@ -22,11 +22,13 @@ CYCLE_TIME = 100
 
 # Values that will be allowed for override, 1.0 = 100%
 MAX_FEED_OVERRIDE    = 1.5
-MAX_SPINDLE_OVERRIDE = 1.2
-MIN_SPINDLE_OVERRIDE = 0.5
+MAX_SPINDLE_0_OVERRIDE = 1.2
+MIN_SPINDLE_0_OVERRIDE = 0.5
 
 # Initial value for spindle speed
-DEFAULT_SPINDLE_SPEED = 450
+# The value will be used the first time Gmoccapy is loaded.
+# It will then be overwritten by the *.pref file.
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # The following are not used, added here to suppress warnings (from qt_istat/logger).
 DEFAULT_LINEAR_VELOCITY = 35
diff --git a/configs/sim/gmoccapy/gmoccapy_4_axis.ini b/configs/sim/gmoccapy/gmoccapy_4_axis.ini
index b973e378abc..20a738395eb 100644
--- a/configs/sim/gmoccapy/gmoccapy_4_axis.ini
+++ b/configs/sim/gmoccapy/gmoccapy_4_axis.ini
@@ -13,8 +13,13 @@ CYCLE_TIME =            100
 
 # Highest value that will be allowed for feed override, 1.0 = 100%
 MAX_FEED_OVERRIDE =     1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE = .5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = .5
+
+# Initial value for spindle speed
+# The value will be used the first time Gmoccapy is loaded.
+# It will then be overwritten by the *.pref file.
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # Prefix to be used
 PROGRAM_PREFIX = ../../nc_files/
diff --git a/configs/sim/gmoccapy/gmoccapy_800x600.ini b/configs/sim/gmoccapy/gmoccapy_800x600.ini
index 5a9b34ad964..158d798654c 100644
--- a/configs/sim/gmoccapy/gmoccapy_800x600.ini
+++ b/configs/sim/gmoccapy/gmoccapy_800x600.ini
@@ -22,14 +22,18 @@ CYCLE_TIME = 100
 
 # Values that will be allowed for override, 1.0 = 100%
 MAX_FEED_OVERRIDE    = 1.5
-MAX_SPINDLE_OVERRIDE = 1.2
-MIN_SPINDLE_OVERRIDE = 0.5
+MAX_SPINDLE_0_OVERRIDE = 1.2
+MIN_SPINDLE_0_OVERRIDE = 0.5
+
+# Initial value for spindle speed
+# The value will be used the first time Gmoccapy is loaded.
+# It will then be overwritten by the *.pref file.
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # Max and default jog speeds in units per second
 MAX_LINEAR_VELOCITY     = 166
 DEFAULT_LINEAR_VELOCITY = 100
 MAX_ANGULAR_VELOCITY    = 234
-DEFAULT_SPINDLE_SPEED   = 450
 
 # Prefix to be used
 PROGRAM_PREFIX = ../../nc_files/
diff --git a/configs/sim/gmoccapy/gmoccapy_XYZAB.ini b/configs/sim/gmoccapy/gmoccapy_XYZAB.ini
index ece32763792..5e014d03ea9 100644
--- a/configs/sim/gmoccapy/gmoccapy_XYZAB.ini
+++ b/configs/sim/gmoccapy/gmoccapy_XYZAB.ini
@@ -35,8 +35,13 @@ CYCLE_TIME =            100
 
 # Highest value that will be allowed for feed override, 1.0 = 100%
 MAX_FEED_OVERRIDE =     1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE = .5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = .5
+
+# Initial value for spindle speed
+# The value will be used the first time Gmoccapy is loaded.
+# It will then be overwritten by the *.pref file.
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # Max and default jog speeds in units per second
 MAX_LINEAR_VELOCITY =   166
diff --git a/configs/sim/gmoccapy/gmoccapy_XYZAC.ini b/configs/sim/gmoccapy/gmoccapy_XYZAC.ini
index 3d14c60f6d4..d91b783c75d 100644
--- a/configs/sim/gmoccapy/gmoccapy_XYZAC.ini
+++ b/configs/sim/gmoccapy/gmoccapy_XYZAC.ini
@@ -26,8 +26,13 @@ CYCLE_TIME =            100
 
 # Highest value that will be allowed for feed override, 1.0 = 100%
 MAX_FEED_OVERRIDE =     1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE = .5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = .5
+
+# Initial value for spindle speed
+# The value will be used the first time Gmoccapy is loaded.
+# It will then be overwritten by the *.pref file.
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # Max and default jog speeds in units per second
 MAX_LINEAR_VELOCITY =   166
diff --git a/configs/sim/gmoccapy/gmoccapy_XYZCW.ini b/configs/sim/gmoccapy/gmoccapy_XYZCW.ini
index 9b7753ebde5..d11e5050b67 100644
--- a/configs/sim/gmoccapy/gmoccapy_XYZCW.ini
+++ b/configs/sim/gmoccapy/gmoccapy_XYZCW.ini
@@ -9,7 +9,7 @@
 [EMC]
 
 VERSION = 1.1
-MACHINE =               gmoccapy XYZAB
+MACHINE =               gmoccapy XYZCW
 DEBUG = 0
 #DEBUG =               0x7FFFFFFF
 
@@ -22,8 +22,13 @@ CYCLE_TIME =            100
 
 # Highest value that will be allowed for feed override, 1.0 = 100%
 MAX_FEED_OVERRIDE =     1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE = .5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = .5
+
+# Initial value for spindle speed
+# The value will be used the first time Gmoccapy is loaded.
+# It will then be overwritten by the *.pref file.
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # Max and default jog speeds in units per second
 MAX_LINEAR_VELOCITY =   166
diff --git a/configs/sim/gmoccapy/gmoccapy_blockdelete.ini b/configs/sim/gmoccapy/gmoccapy_blockdelete.ini
index e2a5f011892..46a56ce52f1 100644
--- a/configs/sim/gmoccapy/gmoccapy_blockdelete.ini
+++ b/configs/sim/gmoccapy/gmoccapy_blockdelete.ini
@@ -22,14 +22,18 @@ CYCLE_TIME =            100
 
 # Values that will be allowed for override, 1.0 = 100%
 MAX_FEED_OVERRIDE    =  1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE = 0.5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = 0.5
+
+# Initial value for spindle speed
+# The value will be used the first time Gmoccapy is loaded.
+# It will then be overwritten by the *.pref file.
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # Max and default jog speeds in units per second
 MAX_LINEAR_VELOCITY =   166
 DEFAULT_LINEAR_VELOCITY = 100
 MAX_ANGULAR_VELOCITY = 234
-DEFAULT_SPINDLE_SPEED = 450
 
 # Prefix to be used
 PROGRAM_PREFIX = ../../nc_files/
diff --git a/configs/sim/gmoccapy/gmoccapy_left_panel.ini b/configs/sim/gmoccapy/gmoccapy_left_panel.ini
index dd1b3fc1d46..c3a8aeca27a 100644
--- a/configs/sim/gmoccapy/gmoccapy_left_panel.ini
+++ b/configs/sim/gmoccapy/gmoccapy_left_panel.ini
@@ -22,8 +22,13 @@ CYCLE_TIME =            100
 
 # Highest value that will be allowed for feed override, 1.0 = 100%
 MAX_FEED_OVERRIDE =     1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE = .5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = .5
+
+# Initial value for spindle speed
+# The value will be used the first time Gmoccapy is loaded.
+# It will then be overwritten by the *.pref file.
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # Prefix to be used
 PROGRAM_PREFIX = ../../nc_files/
diff --git a/configs/sim/gmoccapy/gmoccapy_messages.ini b/configs/sim/gmoccapy/gmoccapy_messages.ini
index 75e5b3fc624..b5919e91a72 100644
--- a/configs/sim/gmoccapy/gmoccapy_messages.ini
+++ b/configs/sim/gmoccapy/gmoccapy_messages.ini
@@ -18,8 +18,13 @@ CYCLE_TIME =            100
 
 # Highest value that will be allowed for feed override, 1.0 = 100%
 MAX_FEED_OVERRIDE =     1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE = .5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = .5
+
+# Initial value for spindle speed
+# The value will be used the first time Gmoccapy is loaded.
+# It will then be overwritten by the *.pref file.
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # Max and default jog speeds in units per second
 MAX_LINEAR_VELOCITY =   166
diff --git a/configs/sim/gmoccapy/gmoccapy_pedant.ini b/configs/sim/gmoccapy/gmoccapy_pedant.ini
index 4aa3bae6131..d165f3cc14d 100644
--- a/configs/sim/gmoccapy/gmoccapy_pedant.ini
+++ b/configs/sim/gmoccapy/gmoccapy_pedant.ini
@@ -22,8 +22,13 @@ CYCLE_TIME =            100
 
 # Highest value that will be allowed for feed override, 1.0 = 100%
 MAX_FEED_OVERRIDE =     1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE = .5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = .5
+
+# Initial value for spindle speed
+# The value will be used the first time Gmoccapy is loaded.
+# It will then be overwritten by the *.pref file.
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # Prefix to be used
 PROGRAM_PREFIX = /home/emcmesa/linuxcnc/nc_files
diff --git a/configs/sim/gmoccapy/gmoccapy_pyngcgui.ini b/configs/sim/gmoccapy/gmoccapy_pyngcgui.ini
index 4f75fb037e5..95b5110aaf1 100644
--- a/configs/sim/gmoccapy/gmoccapy_pyngcgui.ini
+++ b/configs/sim/gmoccapy/gmoccapy_pyngcgui.ini
@@ -50,14 +50,18 @@ CYCLE_TIME =            100
 
 # Values that will be allowed for override, 1.0 = 100%
 MAX_FEED_OVERRIDE    =  1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE = 0.5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = 0.5
+
+# Initial value for spindle speed
+# The value will be used the first time Gmoccapy is loaded.
+# It will then be overwritten by the *.pref file.
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # Max and default jog speeds in units per second
 MAX_LINEAR_VELOCITY =   166
 DEFAULT_LINEAR_VELOCITY = 100
 MAX_ANGULAR_VELOCITY = 234
-DEFAULT_SPINDLE_SPEED = 450
 
 # Prefix to be used
 PROGRAM_PREFIX = ../../nc_files/
diff --git a/configs/sim/gmoccapy/gmoccapy_pyngcgui_gcmc.ini b/configs/sim/gmoccapy/gmoccapy_pyngcgui_gcmc.ini
index d851a17db41..d71508fb5c4 100644
--- a/configs/sim/gmoccapy/gmoccapy_pyngcgui_gcmc.ini
+++ b/configs/sim/gmoccapy/gmoccapy_pyngcgui_gcmc.ini
@@ -62,14 +62,18 @@ CYCLE_TIME =            100
 
 # Values that will be allowed for override, 1.0 = 100%
 MAX_FEED_OVERRIDE    =  1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE = 0.5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = 0.5
+
+# Initial value for spindle speed
+# The value will be used the first time Gmoccapy is loaded.
+# It will then be overwritten by the *.pref file.
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # Max and default jog speeds in units per second
 MAX_LINEAR_VELOCITY =   166
 DEFAULT_LINEAR_VELOCITY = 100
 MAX_ANGULAR_VELOCITY = 234
-DEFAULT_SPINDLE_SPEED = 450
 
 # Introductory graphic
 INTRO_GRAPHIC = linuxcnc.gif
diff --git a/configs/sim/gmoccapy/gmoccapy_qt_messages.ini b/configs/sim/gmoccapy/gmoccapy_qt_messages.ini
index 40080dea6c0..99137c2e6a2 100644
--- a/configs/sim/gmoccapy/gmoccapy_qt_messages.ini
+++ b/configs/sim/gmoccapy/gmoccapy_qt_messages.ini
@@ -22,14 +22,19 @@ CYCLE_TIME = 100
 
 # Values that will be allowed for override, 1.0 = 100%
 MAX_FEED_OVERRIDE    = 1.5
-MAX_SPINDLE_OVERRIDE = 1.2
-MIN_SPINDLE_OVERRIDE = 0.5
+MAX_SPINDLE_0_OVERRIDE = 1.2
+MIN_SPINDLE_0_OVERRIDE = 0.5
+
+# Initial value for spindle speed
+# The value will be used the first time Gmoccapy is loaded.
+# It will then be overwritten by the *.pref file.
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # Max and default jog speeds in units per second
 MAX_LINEAR_VELOCITY     = 166
 DEFAULT_LINEAR_VELOCITY = 100
 MAX_ANGULAR_VELOCITY    = 234
-DEFAULT_SPINDLE_SPEED   = 450
+
 
 # Prefix to be used
 PROGRAM_PREFIX = ../../nc_files/
diff --git a/configs/sim/gmoccapy/gmoccapy_right_panel.ini b/configs/sim/gmoccapy/gmoccapy_right_panel.ini
index 2b7c12274c0..8e5794f062f 100644
--- a/configs/sim/gmoccapy/gmoccapy_right_panel.ini
+++ b/configs/sim/gmoccapy/gmoccapy_right_panel.ini
@@ -18,8 +18,13 @@ CYCLE_TIME =            100
 
 # Highest value that will be allowed for feed override, 1.0 = 100%
 MAX_FEED_OVERRIDE =     1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE = .5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = .5
+
+# Initial value for spindle speed
+# The value will be used the first time Gmoccapy is loaded.
+# It will then be overwritten by the *.pref file.
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # Prefix to be used
 PROGRAM_PREFIX = ../../nc_files/
diff --git a/configs/sim/gmoccapy/gmoccapy_sim_hardware_button.ini b/configs/sim/gmoccapy/gmoccapy_sim_hardware_button.ini
index b7923090091..7f761b756a1 100644
--- a/configs/sim/gmoccapy/gmoccapy_sim_hardware_button.ini
+++ b/configs/sim/gmoccapy/gmoccapy_sim_hardware_button.ini
@@ -25,8 +25,13 @@ CYCLE_TIME =            100
 
 # Highest value that will be allowed for feed override, 1.0 = 100%
 MAX_FEED_OVERRIDE =     1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE = .5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = .5
+
+# Initial value for spindle speed
+# The value will be used the first time Gmoccapy is loaded.
+# It will then be overwritten by the *.pref file.
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # Prefix to be used
 PROGRAM_PREFIX = ../../nc_files/
diff --git a/configs/sim/gmoccapy/gmoccapy_tool_sensor.ini b/configs/sim/gmoccapy/gmoccapy_tool_sensor.ini
index 37daf107549..56126a68640 100644
--- a/configs/sim/gmoccapy/gmoccapy_tool_sensor.ini
+++ b/configs/sim/gmoccapy/gmoccapy_tool_sensor.ini
@@ -30,10 +30,13 @@ CYCLE_TIME =            100
 
 # Highest value that will be allowed for feed override, 1.0 = 100%
 MAX_FEED_OVERRIDE =     1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE = .5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = .5
 
-DEFAULT_SPINDLE_SPEED = 450
+# Initial value for spindle speed
+# The value will be used the first time Gmoccapy is loaded.
+# It will then be overwritten by the *.pref file.
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # Prefix to be used
 PROGRAM_PREFIX = ../../../nc_files/
diff --git a/configs/sim/gmoccapy/gmoccapy_with_user_tabs.ini b/configs/sim/gmoccapy/gmoccapy_with_user_tabs.ini
index fcbd5a6f0d4..1d3fb8549ae 100644
--- a/configs/sim/gmoccapy/gmoccapy_with_user_tabs.ini
+++ b/configs/sim/gmoccapy/gmoccapy_with_user_tabs.ini
@@ -42,8 +42,13 @@ CYCLE_TIME =            100
 
 # Highest value that will be allowed for feed override, 1.0 = 100%
 MAX_FEED_OVERRIDE =     1.5
-MAX_SPINDLE_OVERRIDE =  1.2
-MIN_SPINDLE_OVERRIDE = .5
+MAX_SPINDLE_0_OVERRIDE =  1.2
+MIN_SPINDLE_0_OVERRIDE = .5
+
+# Initial value for spindle speed
+# The value will be used the first time Gmoccapy is loaded.
+# It will then be overwritten by the *.pref file.
+DEFAULT_SPINDLE_0_SPEED = 450
 
 # Prefix to be used
 PROGRAM_PREFIX = ../../nc_files/
diff --git a/src/emc/usr_intf/gmoccapy/getiniinfo.py b/src/emc/usr_intf/gmoccapy/getiniinfo.py
index 0c275624ea8..b7b75559106 100644
--- a/src/emc/usr_intf/gmoccapy/getiniinfo.py
+++ b/src/emc/usr_intf/gmoccapy/getiniinfo.py
@@ -278,27 +278,27 @@ def get_min_ang_jog_vel(self):
             LOG.warning("No MIN_ANGULAR_VELOCITY entry found in [DISPLAY] of INI file. Using default value of 0.1 degree / min.")
         return float(temp)
 
-    def get_default_spindle_speed(self):
+    def get_default_spindle_0_speed(self):
         # check for default spindle speed settings
-        temp = self.inifile.find("DISPLAY", "DEFAULT_SPINDLE_SPEED")
+        temp = self.inifile.find("DISPLAY", "DEFAULT_SPINDLE_0_SPEED")
         if not temp:
             temp = 300
-            LOG.warning("No DEFAULT_SPINDLE_SPEED entry found in [DISPLAY] of INI file")
+            LOG.warning("No DEFAULT_SPINDLE_0_SPEED entry found in [DISPLAY] of INI file")
         return float(temp)
 
-    def get_max_spindle_override(self):
+    def get_max_spindle_0_override(self):
         # check for override settings
-        temp = self.inifile.find("DISPLAY", "MAX_SPINDLE_OVERRIDE")
+        temp = self.inifile.find("DISPLAY", "MAX_SPINDLE_0_OVERRIDE")
         if not temp:
             temp = 1.0
-            LOG.warning("No MAX_SPINDLE_OVERRIDE entry found in [DISPLAY] of INI file")
+            LOG.warning("No MAX_SPINDLE_0_OVERRIDE entry found in [DISPLAY] of INI file")
         return float(temp)
 
-    def get_min_spindle_override(self):
-        temp = self.inifile.find("DISPLAY", "MIN_SPINDLE_OVERRIDE")
+    def get_min_spindle_0_override(self):
+        temp = self.inifile.find("DISPLAY", "MIN_SPINDLE_0_OVERRIDE")
         if not temp:
             temp = 0.1
-            LOG.warning("No MIN_SPINDLE_OVERRIDE entry found in [DISPLAY] of INI file")
+            LOG.warning("No MIN_SPINDLE_0_OVERRIDE entry found in [DISPLAY] of INI file")
         return float(temp)
 
     def get_max_feed_override(self):
diff --git a/src/emc/usr_intf/gmoccapy/gmoccapy.py b/src/emc/usr_intf/gmoccapy/gmoccapy.py
index eb1c94b18f3..0d94b3ac69c 100644
--- a/src/emc/usr_intf/gmoccapy/gmoccapy.py
+++ b/src/emc/usr_intf/gmoccapy/gmoccapy.py
@@ -582,8 +582,8 @@ def _get_ini_data(self):
         self.rabbit_jog = self.get_ini_info.get_jog_vel()
         self.jog_rate_max = self.get_ini_info.get_max_jog_vel()
 
-        self.spindle_override_max = self.get_ini_info.get_max_spindle_override()
-        self.spindle_override_min = self.get_ini_info.get_min_spindle_override()
+        self.spindle_override_max = self.get_ini_info.get_max_spindle_0_override()
+        self.spindle_override_min = self.get_ini_info.get_min_spindle_0_override()
         self.feed_override_max = self.get_ini_info.get_max_feed_override()
         self.dro_actual = self.get_ini_info.get_position_feedback_actual()
 
@@ -627,7 +627,7 @@ def _get_pref_data(self):
 
         # if there is a INI Entry for default spindle speed, we will use that one as default
         # but if there is a setting in our preference file, that one will beet the INI entry
-        default_spindle_speed = self.get_ini_info.get_default_spindle_speed()
+        default_spindle_speed = self.get_ini_info.get_default_spindle_0_speed()
         self.spindle_start_rpm = self.prefs.getpref( 'spindle_start_rpm', default_spindle_speed, float )
 
         self.kbd_height = self.prefs.getpref("kbd_height", 250, int)
diff --git a/src/emc/usr_intf/pncconf/build_INI.py b/src/emc/usr_intf/pncconf/build_INI.py
index 8f117d8dee0..fabc41840e4 100644
--- a/src/emc/usr_intf/pncconf/build_INI.py
+++ b/src/emc/usr_intf/pncconf/build_INI.py
@@ -78,12 +78,20 @@ def write_inifile(self, base):
         if self.d.position_feedback == 1: temp ="ACTUAL"
         else: temp = "COMMANDED"
         print("POSITION_FEEDBACK = %s"% temp, file=file)
+        print(file=file)
+        print("# Highest value that will be allowed for feed override, 1.0 = 100%", file=file)
         print("MAX_FEED_OVERRIDE = %f"% self.d.max_feed_override, file=file)
 
-        if self.d.frontend == _PD._QTDRAGON:
+        if self.d.frontend == _PD._QTDRAGON or self.d.frontend == _PD._GMOCCAPY:
             print("MAX_SPINDLE_0_OVERRIDE = %f"% self.d.max_spindle_override, file=file)
             print("MIN_SPINDLE_0_OVERRIDE = %f"% self.d.min_spindle_override, file=file)
+            print(file=file)
+            print("# Initial value for spindle speed", file=file)
+            if self.d.frontend == _PD._GMOCCAPY:
+                print("# The value will be used the first time Gmoccapy is loaded", file=file)
+                print("# # It will then be overwritten by the *.pref file", file=file)
             print("DEFAULT_SPINDLE_0_SPEED = 500", file=file)
+            print(file=file)
             print("MIN_SPINDLE_0_SPEED = 100", file=file)
             print("MAX_SPINDLE_0_SPEED = 2500", file=file)
         # qtplasmac doesn't use spindle override
@@ -91,13 +99,20 @@ def write_inifile(self, base):
             print("MAX_SPINDLE_OVERRIDE = %f"% self.d.max_spindle_override, file=file)
             print("MIN_SPINDLE_OVERRIDE = %f"% self.d.min_spindle_override, file=file)
 
+        print(file=file)
+        print("# Introductory graphic", file=file)
         print("INTRO_GRAPHIC = linuxcnc.gif", file=file)
         print("INTRO_TIME = 5", file=file)
+        print(file=file)
+        print("# Prefix to be used", file=file)
         print("PROGRAM_PREFIX = %s" % \
                                     os.path.expanduser("~/linuxcnc/nc_files"), file=file)
+        print(file=file)
         if self.d.pyvcp:
             print("PYVCP = pyvcp-panel.xml", file=file)
+            print(file=file)
         # these are for AXIS GUI and QtPlasmaC
+        print("# list of selectable jog increments", file=file)
         if self.d.units == _PD._METRIC:
             if self.d.frontend == _PD._QTPLASMAC:
                 print("INCREMENTS = %s"% self.d.increments_metric_qtplasmac, file=file)
@@ -108,6 +123,7 @@ def write_inifile(self, base):
                 print("INCREMENTS = %s"% self.d.increments_imperial_qtplasmac, file=file)
             else:
                 print("INCREMENTS = %s"% self.d.increments_imperial, file=file)
+        print(file=file)
         if self.d.axes == 2:
             print("LATHE = 1", file=file)
         print("POSITION_FEEDBACK = %s"% temp, file=file)
@@ -121,6 +137,8 @@ def write_inifile(self, base):
         if self.d.frontend != _PD._QTPLASMAC:
             print("EDITOR = %s"% self.d.editor, file=file)
         print("GEOMETRY = %s"% self.d.geometry, file=file)
+        print(file=file)
+        print("# Cycle time, in milliseconds, that display will sleep between polls", file=file)
         print("CYCLE_TIME = 100", file=file)
 
         # set up MDI macro buttons