diff --git a/Grbl_Esp32/src/Grbl.h b/Grbl_Esp32/src/Grbl.h
index d5e9349f..647e0c06 100644
--- a/Grbl_Esp32/src/Grbl.h
+++ b/Grbl_Esp32/src/Grbl.h
@@ -23,7 +23,7 @@
 // Grbl versioning system
 
 const char* const GRBL_VERSION       = "1.3a";
-const char* const GRBL_VERSION_BUILD = "20201122";
+const char* const GRBL_VERSION_BUILD = "20201124";
 
 //#include <sdkconfig.h>
 #include <Arduino.h>
diff --git a/Grbl_Esp32/src/ProcessSettings.cpp b/Grbl_Esp32/src/ProcessSettings.cpp
index 1a64d945..f8539203 100644
--- a/Grbl_Esp32/src/ProcessSettings.cpp
+++ b/Grbl_Esp32/src/ProcessSettings.cpp
@@ -54,12 +54,14 @@ void settings_restore(uint8_t restore_flag) {
                 }
             }
         }
+        grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "Settings reset done");
     }
     if (restore_flag & SettingsRestore::Parameters) {
         for (auto idx = CoordIndex::Begin; idx < CoordIndex::End; ++idx) {
             coords[idx]->setDefault();
         }
     }
+    grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "Position offsets reset done");
 }
 
 // Get settings values from non volatile storage into memory
@@ -358,7 +360,6 @@ Error listAlarms(const char* value, WebUI::AuthenticationLevel auth_level, WebUI
     return Error::Ok;
 }
 
-
 const char* errorString(Error errorNumber) {
     auto it = ErrorNames.find(errorNumber);
     return it == ErrorNames.end() ? NULL : it->second;
diff --git a/Grbl_Esp32/src/Spindles/PWMSpindle.cpp b/Grbl_Esp32/src/Spindles/PWMSpindle.cpp
index 3b47c72d..3e71ee7b 100644
--- a/Grbl_Esp32/src/Spindles/PWMSpindle.cpp
+++ b/Grbl_Esp32/src/Spindles/PWMSpindle.cpp
@@ -155,7 +155,7 @@ namespace Spindles {
             return;  // Block during abort.
         }
 
-        if (_current_state == SpindleState::Disable) {  // Halt or set spindle direction and rpm.
+        if (state == SpindleState::Disable) {  // Halt or set spindle direction and rpm.
             sys.spindle_speed = 0;
             stop();
             if (use_delays && (_current_state != state)) {
@@ -164,9 +164,9 @@ namespace Spindles {
                 //grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "SpinDown Done");
             }
         } else {
-            set_dir_pin(_current_state == SpindleState::Cw);
+            set_dir_pin(state == SpindleState::Cw);
             set_rpm(rpm);
-            set_enable_pin(_current_state != SpindleState::Disable);  // must be done after setting rpm for enable features to work
+            set_enable_pin(state != SpindleState::Disable);  // must be done after setting rpm for enable features to work
             if (use_delays && (_current_state != state)) {
                 //grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "SpinUp Start %d", rpm);
                 mc_dwell(spindle_delay_spinup->get());