diff --git a/cfgs/MECHANICAL_GANTRY_CALIBRATION.cfg b/cfgs/MECHANICAL_GANTRY_CALIBRATION.cfg
index 66ff0d6..950419e 100644
--- a/cfgs/MECHANICAL_GANTRY_CALIBRATION.cfg
+++ b/cfgs/MECHANICAL_GANTRY_CALIBRATION.cfg
@@ -48,7 +48,7 @@
 [gcode_macro MECHANICAL_GANTRY_CALIBRATION]
 gcode:
     ### SET THIS DEFAULT CARFULLY - start really low
-    {% set my_current = params.CURRENT|default(0.12)|float %} ; adjust crash current on the fly :D
+    {% 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 oldhold = printer.configfile.settings["tmc2209 stepper_z"].hold_current %} 
@@ -64,7 +64,7 @@ gcode:
     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 -1} F{fast_move_z * 60 } ; go to the Z-max at speed max z speed
+    G0 Z{z_max -5} F{fast_move_z * 60 } ; go to the Z-max at speed max z speed ; CHANGED
     
     SET_TMC_CURRENT STEPPER=stepper_z CURRENT={my_current} ; drop current on Z stepper
     
@@ -72,13 +72,16 @@ gcode:
         SET_TMC_CURRENT STEPPER=stepper_z1 CURRENT={my_current} ; drop current
     {% endif %}
 
+    BEEP I=1
     G4 P200 ; Probably not necessary, it is here just for sure
 
-    SET_KINEMATIC_POSITION Z={z_max - 12} ; Trick printer into beleiving the gantry is 12mm lower than it is
+    SET_KINEMATIC_POSITION Z={z_max - 17} ; Trick printer into beleiving the gantry is 17mm lower than it is ; CHANGED
 
-    G1 Z{z_max -2} F{6 * 60} ; try to move 10mm up
-    G4 P200 ; wait
+    G1 Z{z_max} F{6 * 60} ; try to move 17mm up ; CHANGED
+    BEEP I=2
+    G4 P10000 ; wait 10 seconds
     G1 Z{z_max -6} F{6 * 60} ; move 4mm down
+    BEEP I=3
     G4 P200 ; same as the first one
     
     SET_TMC_CURRENT STEPPER=stepper_z CURRENT={oldcurrent} HOLDCURRENT={oldhold}
diff --git a/cfgs/macros.cfg b/cfgs/macros.cfg
index 89a9aa9..7d905f2 100644
--- a/cfgs/macros.cfg
+++ b/cfgs/macros.cfg
@@ -25,7 +25,7 @@ gcode:
     G1 E{PRE_PURGE_PRIME_LENGTH} F500       ; pre-purge prime LENGTH SHOULD MATCH YOUR PRINT_END RETRACT
     G1 Y140 E35.0 F1200.0                   ; intro line 1
     G92 E0.0                                ; reset extruder
-    G1 Z3.0                                 ; move nozzle to prevent scratch
+    G1 Z5.0                                 ; move nozzle to prevent scratch
 
 [gcode_macro CANCEL_PRINT]
 rename_existing: BASE_CANCEL_PRINT
diff --git a/misc/M503-output.yml b/misc/M503-output.yml
new file mode 100644
index 0000000..e40e282
--- /dev/null
+++ b/misc/M503-output.yml
@@ -0,0 +1,63 @@
+Recv: echo:; Linear Units:
+Recv: echo:  G21 ; (mm)
+Recv: echo:; Temperature Units:
+Recv: echo:  M149 C ; Units in Celsius
+Recv: echo:; Filament settings (Disabled):
+Recv: echo:  M200 S0 D1.75
+Recv: echo:; Steps per unit:
+Recv: echo:  M92 X80.00 Y80.00 Z800.00 E691.50
+Recv: echo:; Max feedrates (units/s):
+Recv: echo:  M203 X200.00 Y200.00 Z12.00 E120.00
+Recv: echo:; Max Acceleration (units/s2):
+Recv: echo:  M201 X1000.00 Y1000.00 Z200.00 E5000.00
+Recv: echo:; Acceleration (units/s2) (P<print-accel> R<retract-accel> T<travel-accel>):
+Recv: echo:  M204 P1000.00 R1250.00 T1500.00
+Recv: echo:; Advanced (B<min_segment_time_us> S<min_feedrate> T<min_travel_feedrate> J<junc_dev>):
+Recv: echo:  M205 B20000.00 S0.00 T0.00 J0.01
+Recv: echo:; Home offset:
+Recv: echo:  M206 X0.00 Y0.00 Z0.00
+Recv: echo:; Unified Bed Leveling:
+Recv: echo:  M420 S1 Z10.00 ; Leveling ON
+Recv: Unified Bed Leveling System v1.01 active
+Recv: echo:Active Mesh Slot 0
+Recv: echo:EEPROM can hold 2 meshes.
+Recv: echo:; X-Twist Correction:
+Recv:   M423 A0.00 I110.00
+Recv:   M423 X0 Z0.00
+Recv:   M423 X1 Z0.00
+Recv:   M423 X2 Z0.00
+Recv: echo:; Material heatup parameters:
+Recv: echo:  M145 S0 H200.00 B60.00 F0
+Recv: echo:  M145 S1 H240.00 B70.00 F0
+Recv: echo:  M145 S2 H205.00 B45.00 F0
+Recv: echo:  M145 S3 H260.00 B70.00 F0
+Recv: echo:; Hotend PID:
+Recv: echo:  M301 P23.48 I2.99 D46.09
+Recv: echo:; Bed PID:
+Recv: echo:  M304 P163.96 I28.03 D639.32
+Recv: echo:; User thermistors:
+Recv: echo:  M305 P0 R4700.0 T94162.0 B4160.0 C0.000000000 ; HOTEND 0
+Recv: echo:; Power-loss recovery:
+Recv: echo:  M413 S0 ; OFF
+Recv: echo:; Z-Probe Offset:
+Recv: echo:  M851 X28.00 Y-20.00 Z-2.02 ; (mm)
+Recv: echo:; Stepper driver current:
+Recv: echo:  M906 X860 Y900 Z1000
+Recv: echo:  M906 T0 E550
+Recv: echo:; Hybrid Threshold:
+Recv: echo:  M913 X183 Y183 Z41
+Recv: echo:  M913 T0 E60
+Recv: echo:; StallGuard threshold:
+Recv: echo:  M914 X65 Y68
+Recv: echo:; Driver stepping mode:
+Recv: echo:  M569 S1 X Y Z
+Recv: echo:  M569 S1 T0 E
+Recv: echo:; Input Shaping:
+Recv: echo:  M593 X F40.00 D0.15
+Recv: echo:  M593 Y F40.00 D0.15
+Recv: echo:; Linear Advance:
+Recv: echo:  M900 K0.05
+Recv: echo:; Filament load/unload:
+Recv: echo:  M603 L0.00 U50.00 ; (mm)
+Recv: echo:; Filament runout sensor:
+Recv: echo:  M412 S0 ; Sensor OFF
\ No newline at end of file
diff --git a/printer.cfg b/printer.cfg
index d9ff25b..c6a1b22 100644
--- a/printer.cfg
+++ b/printer.cfg
@@ -24,10 +24,10 @@ restart_method: command
 
 [printer]
 kinematics: cartesian
-max_velocity: 200           # NOTE On my printer, I have this set to 300.
-max_accel: 2000             # NOTE On my printer, I have this set to 3000.
-max_z_velocity: 10          # NOTE On my printer, I have this set to 15.
-max_z_accel: 30             # NOTE On my printer, I have this set to 45.
+max_velocity: 200
+max_accel: 3000
+max_z_velocity: 15
+max_z_accel: 45
 
 [stepper_x]
 step_pin: PC2
@@ -81,7 +81,7 @@ microsteps: 32
 rotation_distance: 4
 endstop_pin: probe:z_virtual_endstop
 position_min: -3
-position_max: 257
+position_max: 258 # NOTE You may have to adjust this
 homing_speed: 5
 
 [tmc2209 stepper_z]
@@ -138,19 +138,19 @@ pin: PB1
 x_offset: 27
 y_offset: -20
 z_offset: 0
-samples: 5
+samples: 3
 samples_result: median
 samples_tolerance: 0.01
 samples_tolerance_retries: 5
 
 [safe_z_home]
-home_xy_position: 111.50,111.50
+home_xy_position: 84.50, 135 # NOTE PROBE is at the center of the bed
 speed: 100.0
 z_hop: 10
 z_hop_speed: 15
 
 [bed_mesh]
-speed: 150
+speed: 175
 mesh_min: 27, 5
 mesh_max: 222, 203
 probe_count: 5,5
@@ -173,7 +173,32 @@ sid_pin: PB15
 encoder_pins: ^PB14, ^PB10
 click_pin: ^!PB2
 
-# NOTE this is the pin for the filament switch. Uncomment next 2 lines if you're using one.
+[bed_screws]
+screw1: 26.5, 31
+screw1_name: front left
+screw2: 196.75, 31
+screw2_name: front right
+screw3: 196.75, 201
+screw3_name: back right
+screw4: 26.5, 201
+screw4_name: back left
+
+[screws_tilt_adjust]
+screw1: 111.5, 116.5
+screw1_name: center
+screw2: 26.5, 31
+screw2_name: front left
+screw3: 196.75, 31
+screw3_name: front right
+screw4: 196.75, 201
+screw4_name: back right
+screw5: 26.5, 201
+screw5_name: back left
+speed: 50
+horizontal_move_z: 10
+screw_thread: CCW-M4
+
+# NOTE this is the pin for the filament switch, if you have one
 # [filament_switch_sensor fil_sensor]
 # switch_pin: PA4 # "Pulled-high"
 
@@ -181,6 +206,9 @@ click_pin: ^!PB2
 # Also see [file_manager] section in moonraker.conf.
 [exclude_object]
 
+[force_move]
+enable_force_move: True
+
 #*# <---------------------- SAVE_CONFIG ---------------------->
 #*# DO NOT EDIT THIS BLOCK OR BELOW. The contents are auto-generated.
 #*#