diff --git a/martyn_macros.cfg b/martyn_macros.cfg
index 1f77df2..af28408 100644
--- a/martyn_macros.cfg
+++ b/martyn_macros.cfg
@@ -139,7 +139,7 @@ gcode:
 [gcode_macro CLEAN_NOZZLE]
 variable_start_x: 101
 variable_start_y: 354
-variable_start_z: 2
+variable_start_z: 5
 variable_wipe_dist: -40
 variable_wipe_qty: 5
 variable_wipe_spd: 200
diff --git a/mmu/mmu_vars.cfg b/mmu/mmu_vars.cfg
index ab21083..a8d6339 100644
--- a/mmu/mmu_vars.cfg
+++ b/mmu/mmu_vars.cfg
@@ -1,8 +1,8 @@
 [Variables]
-mmu__revision = 3358
+mmu__revision = 3464
 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
+mmu_calibration_clog_length = 8.9
 mmu_encoder_resolution = 0.968523
 mmu_gear_rotation_distances = [22.731687, 22.686238, 22.849841, 22.94982, 22.958909, 22.94982, 22.895286, 22.958909]
 mmu_selector_bypass = 179.7
@@ -19,20 +19,20 @@ mmu_state_gate_material = ['', '', '', '', '', '', '', '']
 mmu_state_gate_selected = 2
 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 = [0, 0, 1, 0, 0, 0, 0, 0]
+mmu_state_gate_status = [-1, -1, 1, -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': 1080, 'limit': 5000, 'warning': 'Inspect servo arm for wear/damage', 'pause': False}, 'mmu_restarts': {'count': 207, 'limit': -1, 'warning': ''}, 'cutter_blade': {'count': 63, 'limit': 3000, 'warning': 'Inspect/replace filament cutting blade', 'pause': False}}
+mmu_statistics_counters = {'servo_down': {'count': 1090, 'limit': 5000, 'warning': 'Inspect servo arm for wear/damage', 'pause': False}, 'mmu_restarts': {'count': 221, 'limit': -1, 'warning': ''}, 'cutter_blade': {'count': 64, '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': 12, 'load_distance': 16263.579, 'load_delta': 4050.504, 'unloads': 11, 'unload_distance': 9610.7, 'unload_delta': 145.326, 'load_failures': 6, 'unload_failures': 2, 'quality': 0.5935285324634821}
+mmu_statistics_gate_2 = {'pauses': 1, 'loads': 13, 'load_distance': 17777.619, 'load_delta': 4266.723, 'unloads': 13, 'unload_distance': 10985.8, 'unload_delta': 242.944, 'load_failures': 6, 'unload_failures': 2, 'quality': 0.5442276299650511}
 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': 8.44, 'load': 826.68, 'total': 1027.03, 'pre_unload': 7.87, 'post_unload': 5.74, 'unload': 531.24, 'purge': 37.93, 'post_load': 72.02, 'total_swaps': 11, 'swaps_since_pause': 1, 'swaps_since_pause_record': 3, 'form_tip': 74.81, 'total_pauses': 8, 'pause': 1367.03}
+mmu_statistics_swaps = {'pre_load': 8.74, 'load': 920.06, 'total': 1120.72, 'pre_unload': 8.47, 'post_unload': 6.34, 'unload': 609.2, 'purge': 40.59, 'post_load': 77.26, 'total_swaps': 12, 'swaps_since_pause': 2, 'swaps_since_pause_record': 3, 'form_tip': 121.57, 'total_pauses': 8, 'pause': 1367.03}
 nvm_offset = -0.11599999999999978