diff --git a/martyn_macros.cfg b/martyn_macros.cfg
index ade9e06..25e2236 100644
--- a/martyn_macros.cfg
+++ b/martyn_macros.cfg
@@ -3,31 +3,27 @@ gcode:
     {% set BED_TEMP = params.BED|default(60)|float %}
     {% set EXTRUDER_TEMP = params.EXTRUDER|default(190)|float %}
     {% set STANDBY_TEMP = params.STANDBY|default(190)|float %}
-    {% set CHAMBER_TEMP = params.CHAMBER|default(55)|float %}
+    {% set CHAMBER_TEMP = params.CHAMBER|default(45)|float %}
     G90 ; ensure absolute positioning
     STATUS_HOMING
     G92 E0 ; Reset Extruder
-    SMARTHOME ; Home all axes
+    BED_MESH_CLEAR
+    G28 ; Home all axes
+    ;QUAD_GANTRY_LEVEL
     STATUS_HEATING
     ;TEMPERATURE_WAIT SENSOR=heater_bed MINIMUM={STANDBY_TEMP} ; Start heating up the nozzle most of the way
     M190 S{BED_TEMP} ; Start heating the bed, wait until target temperature reached
     M4 P120000 ; Wait 2 minutes
-    ;TEMPERATURE_WAIT SENSOR="temperature_sensor chamber_temp" MINIMUM={CHAMBER_TEMP} ; Wait for chamber temp
+    TEMPERATURE_WAIT SENSOR="temperature_sensor chamber_temp" MINIMUM={CHAMBER_TEMP} ; Wait for chamber temp
     M140 S0 ; turn off power to the bed, interference with probe?
-    SET_GCODE_OFFSET Z=0.0 ; Reset the G-Code Z offset so we can set it manually later. we don't care if move=1|0 because we're about to home anyway.
     G28 Z0 ; Heatsoaked, validate that z
-    G90 ; ensure absolute positioning (how would it be something else?!
-    G1 Z10 F3000
-    QUAD_GANTRY_LEVEL
     STATUS_MESHING
     BED_MESH_CALIBRATE ;Well, this is fine and dandy...
-    G28 Z0 ; Leveled, validate that z!
     M190 S{BED_TEMP} ; Start heating the bed, wait until target temperature reached
     M109 S{EXTRUDER_TEMP} ; Finish heating the nozzle
     CLEAN_NOZZLE
     G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed
     G1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position
-    #SET_GCODE_OFFSET Z_ADJUST=-0.45 MOVE=1 ; This is how we will permanently save the Z offset without having to care about type of probe.
     G1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line
     G1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little
     G1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line
@@ -37,7 +33,7 @@ gcode:
     G1 E-1 ; Retract before cleaning, or we will still have stringing
     CLEAN_NOZZLE ; doing this again is probably gonna make it work!
     SKEW_PROFILE LOAD=calilantern_skew_profile
-    G1 E-0.1 ; "UnRetract" (I forgot we were in absolutes!)
+    G1 E0 ; "UnRetract" (I forgot we were in absolutes!)
     STATUS_PRINTING
 
 #   Use PRINT_END for the slicer ending script - please customise for your slicer of choice
diff --git a/mmu/mmu_vars.cfg b/mmu/mmu_vars.cfg
index 1cddc1f..db257c8 100644
--- a/mmu/mmu_vars.cfg
+++ b/mmu/mmu_vars.cfg
@@ -1,5 +1,5 @@
 [Variables]
-mmu__revision = 2392
+mmu__revision = 2542
 mmu_calibration_bowden_home = 'encoder'
 mmu_calibration_bowden_lengths = [1425.1, 1425.1, 1425.1, 1425.1, 1425.1, 1425.1, 1425.1, 1425.1]
 mmu_calibration_clog_length = 17.4
@@ -24,7 +24,7 @@ mmu_state_gate_temperature = [200, 200, 200, 200, 200, 200, 200, 200]
 mmu_state_last_tool = 1
 mmu_state_tool_selected = -2
 mmu_state_tool_to_gate_map = [0, 1, 2, 3, 4, 5, 6, 7]
-mmu_statistics_counters = {'servo_down': {'count': 812, 'limit': 5000, 'warning': 'Inspect servo arm for wear/damage', 'pause': False}, 'mmu_restarts': {'count': 129, 'limit': -1, 'warning': ''}, 'cutter_blade': {'count': 48, 'limit': 3000, 'warning': 'Inspect/replace filament cutting blade', 'pause': False}}
+mmu_statistics_counters = {'servo_down': {'count': 812, 'limit': 5000, 'warning': 'Inspect servo arm for wear/damage', 'pause': False}, 'mmu_restarts': {'count': 159, 'limit': -1, 'warning': ''}, 'cutter_blade': {'count': 48, 'limit': 3000, 'warning': 'Inspect/replace filament cutting blade', 'pause': False}}
 mmu_statistics_gate_0 = {'pauses': 12, 'loads': 28, 'load_distance': 38354.336, 'load_delta': 6896.202, 'unloads': 43, 'unload_distance': 31567.3, 'unload_delta': 1877.741, 'load_failures': 7, 'unload_failures': 16, 'quality': 0.9546537865318246}
 mmu_statistics_gate_1 = {'pauses': 2, 'loads': 22, 'load_distance': 28896.615, 'load_delta': 90.861, 'unloads': 25, 'unload_distance': 27502.0, 'unload_delta': 1483.93, 'load_failures': 1, 'unload_failures': 5, 'quality': 0.8375118313601163}
 mmu_statistics_gate_2 = {'pauses': 0, 'loads': 0, 'load_distance': 0.0, 'load_delta': 0.0, 'unloads': 0, 'unload_distance': 0.0, 'unload_delta': 0.0, 'load_failures': 0, 'unload_failures': 0, 'quality': -1.0}
diff --git a/printer.cfg b/printer.cfg
index b67b701..82e13bc 100644
--- a/printer.cfg
+++ b/printer.cfg
@@ -119,13 +119,13 @@ enable_pin: !PG5
 rotation_distance: 40
 gear_ratio: 80:16
 microsteps: 32
-endstop_pin: probe:z_virtual_endstop
-#endstop_pin: !ebb36:PB7
+#endstop_pin: probe:z_virtual_endstop
+endstop_pin: !ebb36:PB7
 ##  Z-position of nozzle (in mm) to z-endstop trigger point relative to print surface (Z0)
 ##  (+) value = endstop above Z0, (-) value = endstop below
 ##  Increasing position_endstop brings nozzle closer to the bed
 ##  After you run Z_ENDSTOP_CALIBRATE, position_endstop will be stored at the very end of your config
-#position_endstop: -0.2
+position_endstop: 0
 position_max: 310
 position_min: -5
 homing_speed: 15
@@ -404,39 +404,44 @@ sensor_type: temperature_mcu
 #   Macros
 #####################################################################
 
-[probe] ## Other parameters in config.cfg
-pin: !ebb36:PB7
-x_offset: 0.0
-y_offset: 0.0
-z_offset: 0.0
-speed: 15.0 #   Speed (in mm/s) of the Z axis when probing. The default is 5mm/s.
-samples: 2
-sample_retract_dist: 3.0
-samples_tolerance_retries: 1
-lift_speed: 10
-activate_gcode:
-    G4 P200 ;Wait 200ms
-    SET_TMC_CURRENT STEPPER=stepper_z CURRENT=0.4
-    SET_TMC_CURRENT STEPPER=stepper_z1 CURRENT=0.4
-    SET_TMC_CURRENT STEPPER=stepper_z2 CURRENT=0.4
-    SET_TMC_CURRENT STEPPER=stepper_z3 CURRENT=0.4
-deactivate_gcode:
-    {% set run_current = printer.configfile.config['tmc2209 stepper_z'].run_current | float %}
-    SET_TMC_CURRENT STEPPER=stepper_z CURRENT={run_current}
-    SET_TMC_CURRENT STEPPER=stepper_z1 CURRENT={run_current}
-    SET_TMC_CURRENT STEPPER=stepper_z2 CURRENT={run_current}
-    SET_TMC_CURRENT STEPPER=stepper_z3 CURRENT={run_current}
+#[probe] ## Other parameters in config.cfg
+#pin: !ebb36:PB7
+#x_offset: 0.0
+#y_offset: 0.0
+#z_offset: 0.0
+#speed: 15.0 #   Speed (in mm/s) of the Z axis when probing. The default is 5mm/s.
+#samples: 2
+#sample_retract_dist: 3.0
+#samples_tolerance_retries: 1
+#lift_speed: 10
+#activate_gcode:
+#    G4 P200 ;Wait 200ms
+#    SET_TMC_CURRENT STEPPER=stepper_z CURRENT=0.4
+#    SET_TMC_CURRENT STEPPER=stepper_z1 CURRENT=0.4
+#    SET_TMC_CURRENT STEPPER=stepper_z2 CURRENT=0.4
+#    SET_TMC_CURRENT STEPPER=stepper_z3 CURRENT=0.4
+#deactivate_gcode:
+#    {% set run_current = printer.configfile.config['tmc2209 stepper_z'].run_current | float %}
+#    SET_TMC_CURRENT STEPPER=stepper_z CURRENT={run_current}
+#    SET_TMC_CURRENT STEPPER=stepper_z1 CURRENT={run_current}
+#    SET_TMC_CURRENT STEPPER=stepper_z2 CURRENT={run_current}
+#    SET_TMC_CURRENT STEPPER=stepper_z3 CURRENT={run_current}
 
 [bed_mesh]
 speed: 800
 horizontal_move_z: 3
-mesh_min: 0, 0
+mesh_min: 30, 30
 mesh_max: 310, 310
 zero_reference_position: 175, 175
-# #mesh_pps: 9, 9
+mesh_pps: 9, 9
 algorithm: bicubic
 bicubic_tension: 0.2
-probe_count: 7,7
+probe_count: 9,9
+
+[gcode_macro BED_MESH_CALIBRATE]
+rename_existing: BTT_BED_MESH_CALIBRATE
+gcode:
+  BTT_BED_MESH_CALIBRATE METHOD=rapid_scan
 
 [input_shaper]
 shaper_freq_x: 91.4
@@ -446,18 +451,18 @@ shaper_type: 3hump_ei
 [mcu eddy]
 canbus_uuid: 01dd4779f312
 
-#[probe_eddy_current btt_eddy]
-#sensor_type: ldc1612
-#z_offset: 2.01
-#i2c_mcu: eddy
-#i2c_bus: i2c0f
-#x_offset: 0
-#y_offset: 21.42
+[probe_eddy_current btt_eddy]
+sensor_type: ldc1612
+z_offset: 2.01
+i2c_mcu: eddy
+i2c_bus: i2c0f
+x_offset: 0
+y_offset: 21.42
 
-#[temperature_probe btt_eddy]
-#sensor_type: Generic 3950
-#sensor_pin: eddy:gpio26
-#horizontal_move_z: 2
+[temperature_probe btt_eddy]
+sensor_type: Generic 3950
+sensor_pin: eddy:gpio26
+horizontal_move_z: 2
 
 [gcode_macro PROBE_EDDY_CURRENT_CALIBRATE_AUTO]
 gcode:
@@ -479,27 +484,79 @@ enable_force_move: True
 #*# [bed_mesh default]
 #*# version = 1
 #*# points =
-#*# 	  -0.013814, 0.002245, 0.005321, 0.037976, 0.048046, 0.060540, 0.070946, 0.056286, 0.060975
-#*# 	  -0.001514, -0.003904, 0.018992, 0.015656, 0.024350, 0.037976, 0.057306, 0.054291, 0.038143
-#*# 	  -0.032466, -0.007290, 0.009769, 0.005321, 0.029468, 0.034263, 0.062378, 0.049342, 0.044221
-#*# 	  -0.041181, -0.025479, -0.007925, -0.000403, 0.004208, 0.031030, 0.042659, 0.031605, 0.029899
-#*# 	  -0.059714, -0.035092, -0.003052, -0.006128, -0.000229, 0.008656, 0.032592, 0.019419, 0.030166
-#*# 	  -0.062837, -0.016463, -0.010738, 0.004044, -0.000826, 0.024083, 0.047180, 0.033722, 0.040834
-#*# 	  -0.040349, -0.016038, 0.003360, 0.008820, 0.014120, 0.031030, 0.053163, 0.038785, 0.043882
-#*# 	  -0.027854, -0.012273, 0.009507, 0.015658, 0.020269, 0.042397, 0.052996, 0.039967, 0.049342
-#*# 	  -0.021443, -0.001939, 0.002669, 0.013694, 0.017621, 0.031032, 0.048044, 0.044225, 0.041100
+#*# 	-0.042300, -0.024348, -0.036666, -0.017664, -0.025407, -0.050054, 0.017329, -0.031042, -0.038785
+#*# 	-0.007723, -0.005574, 0.027356, 0.013756, -0.021179, 0.013756, 0.069095, 0.045122, 0.025202
+#*# 	0.008027, 0.002299, 0.038640, 0.015910, 0.011601, -0.013425, 0.045122, 0.027356, 0.011601
+#*# 	-0.007728, 0.000155, 0.029732, 0.033775, 0.023415, 0.011601, 0.003728, 0.015910, 0.029732
+#*# 	-0.021179, 0.020556, 0.001942, 0.000155, 0.000155, -0.004864, 0.015910, 0.005883, 0.002299
+#*# 	-0.033151, 0.029732, 0.008027, 0.013756, 0.011601, 0.012678, 0.065388, -0.005574, 0.021628
+#*# 	-0.004144, 0.008027, 0.019484, 0.054030, 0.049165, 0.033775, 0.069095, 0.003014, 0.013756
+#*# 	-0.038785, -0.004144, 0.042683, 0.042683, 0.032972, 0.021628, 0.062950, 0.045122, -0.023288
+#*# 	-0.002000, -0.021179, 0.003728, 0.019484, -0.013425, 0.013756, 0.038640, -0.034557, -0.015545
 #*# x_count = 9
 #*# y_count = 9
 #*# mesh_x_pps = 9
 #*# mesh_y_pps = 9
 #*# algo = bicubic
 #*# tension = 0.2
-#*# min_x = 35.0
-#*# max_x = 309.96
-#*# min_y = 35.0
-#*# max_y = 309.96000000000004
+#*# min_x = 30.0
+#*# max_x = 310.0
+#*# min_y = 30.0
+#*# max_y = 310.0
 #*#
 #*# [skew_correction calilantern_skew_profile]
 #*# xy_skew = 0.007318697823262824
 #*# xz_skew = 0.0004313347372552723
 #*# yz_skew = -0.0005939714989857676
+#*#
+#*# [probe_eddy_current btt_eddy]
+#*# reg_drive_current = 15
+#*# calibrate =
+#*# 	0.050000:3257588.070,0.090000:3256964.916,0.130000:3256304.573,
+#*# 	0.170000:3255627.762,0.210000:3254987.031,0.250000:3254339.955,
+#*# 	0.290000:3253702.183,0.330000:3253055.241,0.370000:3252462.920,
+#*# 	0.410000:3251870.953,0.450000:3251222.715,0.490000:3250619.815,
+#*# 	0.530000:3250006.877,0.570000:3249441.817,0.610000:3248836.353,
+#*# 	0.650000:3248246.169,0.690000:3247681.761,0.730000:3247143.636,
+#*# 	0.770000:3246541.450,0.810000:3246011.719,0.850000:3245477.255,
+#*# 	0.890000:3244924.790,0.930000:3244401.932,0.970000:3243850.098,
+#*# 	1.010000:3243383.419,1.050000:3242812.820,1.090000:3242313.228,
+#*# 	1.130000:3241788.575,1.170000:3241304.196,1.210000:3240811.189,
+#*# 	1.250000:3240330.713,1.290000:3239850.828,1.330000:3239431.896,
+#*# 	1.370000:3238915.608,1.410000:3238479.186,1.450000:3238017.048,
+#*# 	1.490000:3237583.714,1.530000:3237154.934,1.570000:3236718.382,
+#*# 	1.610000:3236280.224,1.650000:3235872.001,1.690000:3235459.235,
+#*# 	1.730000:3235049.059,1.770000:3234643.809,1.810000:3234254.456,
+#*# 	1.850000:3233866.757,1.890000:3233490.216,1.930000:3233109.405,
+#*# 	1.970000:3232746.999,2.010000:3232379.923,2.050000:3232006.220,
+#*# 	2.090000:3231658.941,2.130000:3231313.139,2.170000:3230957.177,
+#*# 	2.210000:3230633.999,2.250000:3230307.913,2.290000:3229966.771,
+#*# 	2.330000:3229649.263,2.370000:3229335.018,2.410000:3229011.378,
+#*# 	2.450000:3228712.819,2.490000:3228417.910,2.530000:3228108.281,
+#*# 	2.570000:3227815.038,2.610000:3227532.720,2.650000:3227249.805,
+#*# 	2.690000:3226976.764,2.730000:3226686.376,2.770000:3226417.626,
+#*# 	2.810000:3226166.807,2.850000:3225899.633,2.890000:3225606.227,
+#*# 	2.930000:3225383.271,2.970000:3225140.767,3.010000:3224884.488,
+#*# 	3.050000:3224632.580,3.090000:3224375.721,3.130000:3224165.999,
+#*# 	3.170000:3223942.487,3.210000:3223723.353,3.250000:3223477.094,
+#*# 	3.290000:3223247.144,3.330000:3223043.429,3.370000:3222823.368,
+#*# 	3.410000:3222588.610,3.450000:3222381.195,3.490000:3222221.090,
+#*# 	3.530000:3221989.948,3.570000:3221809.201,3.610000:3221622.117,
+#*# 	3.650000:3221392.225,3.690000:3221206.721,3.730000:3221051.522,
+#*# 	3.770000:3220834.386,3.810000:3220690.522,3.850000:3220499.700,
+#*# 	3.890000:3220307.943,3.930000:3220149.243,3.970000:3219964.886,
+#*# 	4.010000:3219791.608,4.050000:3219632.208
+#*#
+#*# [temperature_probe btt_eddy]
+#*# calibration_temp = 39.478475
+#*# drift_calibration =
+#*# 	3283778.235798, -965.466451, 7.227764
+#*# 	3268264.899482, -672.371276, 4.751202
+#*# 	3255073.726147, -430.741384, 2.745695
+#*# 	3244394.549464, -246.759626, 1.241065
+#*# 	3234441.269724, -51.153784, -0.446005
+#*# 	3227424.139563, 62.633837, -1.378854
+#*# 	3222282.704100, 131.724886, -1.919297
+#*# 	3217484.155747, 210.709950, -2.581193
+#*# 	3214114.202863, 253.314424, -2.921597
+#*# drift_calibration_min_temp = 39.40781081763649