diff --git a/cfgs/MECHANICAL_GANTRY_CALIBRATION.cfg b/cfgs/MECHANICAL_GANTRY_CALIBRATION.cfg
index 950419e..f99852c 100644
--- a/cfgs/MECHANICAL_GANTRY_CALIBRATION.cfg
+++ b/cfgs/MECHANICAL_GANTRY_CALIBRATION.cfg
@@ -50,7 +50,7 @@ gcode:
     ### SET THIS DEFAULT CARFULLY - start really low
     {% set my_current = params.CURRENT|default(0.20)|float %} ; adjust crash current on the fly :D
     ###
-    {% set oldcurrent = printer.configfile.settings["tmc2209 stepper_z"].run_current %} ; TODO: Find runtime current settings
+    {% set oldcurrent = printer.configfile.settings["tmc2209 stepper_z"].run_current %}
     {% set oldhold = printer.configfile.settings["tmc2209 stepper_z"].hold_current %} 
     {% set x_max = printer.toolhead.axis_maximum.x %} 
     {% set y_max = printer.toolhead.axis_maximum.y %} 
@@ -59,12 +59,12 @@ gcode:
     {% set fast_move = printer.configfile.settings["printer"].max_velocity %}
     M117 {printer.homed_axes}
     {% if printer.homed_axes != 'xyz' %}
-        G28							#Home All Axes
+        G28 ; Home All Axes
     {% endif %}
     G90 ; absolute
     G0 X{x_max / 2} Y{y_max / 2} F{fast_move * 30 } ;put toolhead in the center of the gantry
 
-    G0 Z{z_max -5} F{fast_move_z * 60 } ; go to the Z-max at speed max z speed ; CHANGED
+    G0 Z{z_max -5} F{fast_move_z * 60 } ; go to the Z-max - 5 at speed max z speed ; CHANGED
     
     SET_TMC_CURRENT STEPPER=stepper_z CURRENT={my_current} ; drop current on Z stepper
     
@@ -75,9 +75,9 @@ gcode:
     BEEP I=1
     G4 P200 ; Probably not necessary, it is here just for sure
 
-    SET_KINEMATIC_POSITION Z={z_max - 17} ; Trick printer into beleiving the gantry is 17mm lower than it is ; CHANGED
+    SET_KINEMATIC_POSITION Z={z_max - 25} ; Trick printer into beleiving the gantry is 25mm lower than it is ; CHANGED
 
-    G1 Z{z_max} F{6 * 60} ; try to move 17mm up ; CHANGED
+    G1 Z{z_max} F{6 * 60} ; based on above figures, there will be 20mm worth of grinding ; CHANGED
     BEEP I=2
     G4 P10000 ; wait 10 seconds
     G1 Z{z_max -6} F{6 * 60} ; move 4mm down