diff --git a/martyn_macros.cfg b/martyn_macros.cfg
index 931cc38..3fe2be9 100644
--- a/martyn_macros.cfg
+++ b/martyn_macros.cfg
@@ -86,6 +86,24 @@ gcode:
     RESTORE_GCODE_STATE NAME=STATE_PRINT_END
     BACKUP_CFG ;backup the config in case anything changed since last print.
 
+[gcode_macro IMPORTANT_START_BITS]
+description: Mostly for operating the filametrix with mesh calibration etc.  Close enough to actual printing coordinates but without heatsoak.
+gcode:
+    G90 ; ensure absolute positioning
+    M117 Homing
+    STATUS_HOMING
+    G92 E0 ; Reset Extruder
+    BED_MESH_CLEAR
+    G28 ; Home all axes
+    M117 Eddy Tap
+    G1 X175 Y175 Z2
+    PROBE_EDDY_NG_TAP
+    M117 Bed mesh eddy scan
+    STATUS_MESHING
+    BED_MESH_CALIBRATE
+    SKEW_PROFILE LOAD=calilantern_skew_profile
+    M117 Ready.  Printing coordinates in place.
+
 [gcode_macro CANCEL_PRINT]
 description: Cancel the actual running print
 rename_existing: CANCEL_PRINT_BASE
diff --git a/mmu/mmu_vars.cfg b/mmu/mmu_vars.cfg
index 68580ea..834f82c 100644
--- a/mmu/mmu_vars.cfg
+++ b/mmu/mmu_vars.cfg
@@ -1,5 +1,5 @@
 [Variables]
-mmu__revision = 3612
+mmu__revision = 3673
 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 = 8.9
@@ -16,23 +16,23 @@ mmu_state_filament_remaining_color = ''
 mmu_state_gate_color = ['', '', '', '', '', '', '', '']
 mmu_state_gate_filament_name = ['', '', '', '', '', '', '', '']
 mmu_state_gate_material = ['', '', '', '', '', '', '', '']
-mmu_state_gate_selected = 2
+mmu_state_gate_selected = 1
 mmu_state_gate_speed_override = [100, 100, 100, 100, 100, 100, 100, 100]
 mmu_state_gate_spool_id = [-1, -1, -1, -1, -1, -1, -1, -1]
-mmu_state_gate_status = [-1, -1, 2, -1, -1, -1, -1, -1]
+mmu_state_gate_status = [-1, 1, 2, -1, -1, -1, -1, -1]
 mmu_state_gate_temperature = [200, 200, 200, 200, 200, 200, 200, 200]
 mmu_state_last_tool = 0
 mmu_state_tool_selected = 0
-mmu_state_tool_to_gate_map = [2, 2, 2, 2, 2, 2, 2, 2]
-mmu_statistics_counters = {'servo_down': {'count': 1122, 'limit': 5000, 'warning': 'Inspect servo arm for wear/damage', 'pause': False}, 'mmu_restarts': {'count': 235, 'limit': -1, 'warning': ''}, 'cutter_blade': {'count': 65, 'limit': 3000, 'warning': 'Inspect/replace filament cutting blade', 'pause': False}}
+mmu_state_tool_to_gate_map = [1, 1, 1, 1, 1, 1, 1, 1]
+mmu_statistics_counters = {'servo_down': {'count': 1131, 'limit': 5000, 'warning': 'Inspect servo arm for wear/damage', 'pause': False}, 'mmu_restarts': {'count': 237, 'limit': -1, 'warning': ''}, 'cutter_blade': {'count': 67, 'limit': 3000, 'warning': 'Inspect/replace filament cutting blade', 'pause': False}}
 mmu_statistics_gate_0 = {'pauses': 0, 'loads': 2, 'load_distance': 0.0, 'load_delta': 0.0, 'unloads': 0, 'unload_distance': 0.0, 'unload_delta': 0.0, 'load_failures': 2, 'unload_failures': 0, 'quality': -1.0}
-mmu_statistics_gate_1 = {'pauses': 7, 'loads': 14, 'load_distance': 17363.659, 'load_delta': 6553.004, 'unloads': 15, 'unload_distance': 8235.6, 'unload_delta': 468.046, 'load_failures': 8, 'unload_failures': 5, 'quality': 0.5019132500615917}
-mmu_statistics_gate_2 = {'pauses': 1, 'loads': 14, 'load_distance': 19284.879, 'load_delta': 4486.816, 'unloads': 14, 'unload_distance': 12360.9, 'unload_delta': 332.814, 'load_failures': 6, 'unload_failures': 2, 'quality': 0.5157971895041114}
+mmu_statistics_gate_1 = {'pauses': 7, 'loads': 16, 'load_distance': 20400.457, 'load_delta': 7020.311, 'unloads': 16, 'unload_distance': 9610.7, 'unload_delta': 534.671, 'load_failures': 8, 'unload_failures': 5, 'quality': 0.4424617663045427}
+mmu_statistics_gate_2 = {'pauses': 1, 'loads': 14, 'load_distance': 19284.879, 'load_delta': 4486.816, 'unloads': 15, 'unload_distance': 13736.0, 'unload_delta': 411.062, 'load_failures': 6, 'unload_failures': 2, 'quality': 0.5699077987480133}
 mmu_statistics_gate_3 = {'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}
 mmu_statistics_gate_4 = {'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}
 mmu_statistics_gate_5 = {'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}
 mmu_statistics_gate_6 = {'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}
 mmu_statistics_gate_7 = {'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}
-mmu_statistics_swaps = {'pre_load': 9.04, 'load': 993.72, 'total': 1120.72, 'pre_unload': 8.77, 'post_unload': 6.64, 'unload': 643.57, 'purge': 41.72, 'post_load': 82.5, 'total_swaps': 12, 'swaps_since_pause': 2, 'swaps_since_pause_record': 3, 'form_tip': 129.02, 'total_pauses': 8, 'pause': 1367.03}
+mmu_statistics_swaps = {'pre_load': 9.64, 'load': 1067.77, 'total': 1120.72, 'pre_unload': 9.38, 'post_unload': 7.24, 'unload': 710.67, 'purge': 44.02, 'post_load': 92.64, 'total_swaps': 12, 'swaps_since_pause': 2, 'swaps_since_pause_record': 3, 'form_tip': 144.15, 'total_pauses': 8, 'pause': 1367.03}
 nvm_offset = -0.11599999999999978
 
diff --git a/printer.cfg b/printer.cfg
index afd4715..6efa255 100644
--- a/printer.cfg
+++ b/printer.cfg
@@ -475,15 +475,15 @@ enable_force_move: True
 #*# [bed_mesh default]
 #*# version = 1
 #*# points =
-#*# 	  0.019316, 0.031994, 0.033133, 0.061654, 0.034277, 0.057688, 0.059671, 0.040580, 0.026237
-#*# 	  0.058819, 0.044016, 0.033133, 0.058819, 0.048006, 0.067874, 0.089256, 0.052852, 0.040014
-#*# 	  0.030258, 0.042288, 0.033696, 0.030258, 0.033133, 0.033133, 0.048006, 0.033133, 0.018691
-#*# 	  0.012975, 0.006014, 0.017272, 0.023354, 0.015271, 0.019606, 0.033133, 0.031994, 0.009453
-#*# 	  0.008322, -0.005042, 0.008322, 0.012975, -0.000967, 0.001347, 0.026237, -0.000390, 0.004258
-#*# 	  -0.000967, 0.004258, -0.000967, 0.030258, 0.018170, 0.027971, 0.034277, 0.030247, 0.007166
-#*# 	  0.001347, 0.001946, 0.034566, 0.054843, 0.025090, 0.043135, 0.061654, 0.031994, 0.017550
-#*# 	  0.019316, 0.027379, 0.050859, 0.059945, 0.048006, 0.045149, 0.074647, 0.066747, 0.041148
-#*# 	  0.040014, 0.053709, 0.027379, 0.054796, 0.050859, 0.057103, 0.063900, 0.052547, 0.019316
+#*# 	  0.025126, 0.014223, 0.018317, 0.053334, 0.047339, 0.039272, 0.047339, 0.056692, 0.027783
+#*# 	  0.027113, 0.048656, 0.032502, 0.043309, 0.021724, 0.040593, 0.066647, 0.070654, 0.031177
+#*# 	  0.012886, 0.037950, 0.025126, 0.034566, 0.041913, 0.029851, 0.060685, 0.037950, 0.045287
+#*# 	  0.008814, 0.000616, 0.002713, 0.019650, 0.006722, 0.012234, 0.034566, 0.039272, 0.032502
+#*# 	  -0.010299, 0.002983, 0.000616, 0.016984, -0.000727, 0.001959, 0.020393, 0.029104, 0.019650
+#*# 	  0.004043, -0.013759, 0.014906, 0.029851, 0.014906, 0.020393, 0.045287, 0.049972, 0.025126
+#*# 	  0.022390, 0.005389, 0.023055, 0.039208, 0.046605, 0.042649, 0.065350, 0.040593, 0.052020
+#*# 	  0.029104, 0.028816, 0.013570, 0.045287, 0.047339, 0.062664, 0.084536, 0.061355, 0.049972
+#*# 	  0.048656, 0.030141, 0.016984, 0.029851, 0.034566, 0.042649, 0.048656, 0.075290, 0.045287
 #*# x_count = 9
 #*# y_count = 9
 #*# mesh_x_pps = 9