diff --git a/Grbl_Esp32/src/Grbl.h b/Grbl_Esp32/src/Grbl.h
index 9dfc5291..10275f4b 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 = "20201027";
+const char* const GRBL_VERSION_BUILD = "20201101";
 
 //#include <sdkconfig.h>
 #include <Arduino.h>
diff --git a/Grbl_Esp32/src/Machines/tmc2130_pen.h b/Grbl_Esp32/src/Machines/tmc2130_pen.h
index 93380577..24a0a88e 100644
--- a/Grbl_Esp32/src/Machines/tmc2130_pen.h
+++ b/Grbl_Esp32/src/Machines/tmc2130_pen.h
@@ -59,10 +59,10 @@
 
 // Define one of these 2 options for spindle or servo
 #define Z_SERVO_PIN                     GPIO_NUM_27 // comment this out if PWM spindle/laser control.
+#define DEFAULT_Z_MAX_TRAVEL          5.0   // Range of travel is 5mm
+#define DEFAULT_Z_HOMING_MPOS         5.0   // MPos will be set to 5mm after homing
+#define Z_SERVO_CAL_MIN               1.0   // calibration factor for the minimum PWM duty
+#define Z_SERVO_CAL_MAX               1.0   // calibration factor for the maximum PWM duty
 
 // #define X_LIMIT_PIN          See version section at beginning of file
 #define Y_LIMIT_PIN             GPIO_NUM_4
-
-// defaults
-#define DEFAULT_Z_STEPS_PER_MM 100.0    // This is used as the servo calibration
-#define DEFAULT_Z_MAX_TRAVEL 300.0      // This is used as the servo calibration