diff --git a/martyn_macros.cfg b/martyn_macros.cfg
index 9cc672b..32c6b09 100644
--- a/martyn_macros.cfg
+++ b/martyn_macros.cfg
@@ -25,17 +25,17 @@ gcode:
     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.4 MOVE=1 ; This is how we will permanently save the Z offset without having to care about type of probe.
+    SET_GCODE_OFFSET Z_ADJUST=-0.48 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
     G92 E0 ; Reset Extruder
     G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed
     G1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish
-    G1 E-2 ; Retract before cleaning, or we will still have stringing
+    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 E0 ; "UnRetract" (I forgot we were in absolutes!)
+    G1 E-0.1 ; "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/base/mmu.cfg b/mmu/base/mmu.cfg
index 85962c6..4fa9313 100644
--- a/mmu/base/mmu.cfg
+++ b/mmu/base/mmu.cfg
@@ -109,6 +109,7 @@ aliases:
     MMU_GEAR_DIR=gpio1,
     MMU_GEAR_ENABLE=gpio3,
     MMU_GEAR_DIAG=gpio22,
+    MMU_SEL_SERVO=gpio21,
 
 [temperature_sensor MMB]
 sensor_type: temperature_mcu
diff --git a/mmu/base/mmu_hardware.cfg b/mmu/base/mmu_hardware.cfg
index a719a2e..b14c119 100644
--- a/mmu/base/mmu_hardware.cfg
+++ b/mmu/base/mmu_hardware.cfg
@@ -203,7 +203,7 @@ endstop_name: mmu_sel_home
 # SELECTOR SERVO -------------------------------------------------------------------------------------------------------
 #
 [mmu_servo selector_servo]
-pin: mmu:MMU_SEL_SERVO
+pin: mmuext:MMU_SEL_SERVO
 maximum_servo_angle: 180
 minimum_pulse_width: 0.00085
 maximum_pulse_width: 0.00215
@@ -361,7 +361,7 @@ color_order: GRBW		# Set based on your particular neopixel specification (can be
 #
 # (comment out this whole section if you don't have/want leds; uncomment/edit LEDs fitted on your MMU)
 [mmu_leds]
-exit_leds:   neopixel:mmu_leds (1-8)
+exit_leds:   neopixel:mmu_leds (8-1)
 #entry_leds:  neopixel:mmu_leds (9-16)
 #status_leds: neopixel:mmu_leds (17)
 #logo_leds:   neopixel:mmu_leds (18)
diff --git a/mmu/mmu_vars.cfg b/mmu/mmu_vars.cfg
index f8cbea9..a577d20 100644
--- a/mmu/mmu_vars.cfg
+++ b/mmu/mmu_vars.cfg
@@ -1,5 +1,5 @@
 [Variables]
-mmu__revision = 1204
+mmu__revision = 1406
 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
@@ -9,16 +9,22 @@ mmu_selector_bypass = 179.2
 mmu_selector_offsets = [2.0, 25.3, 48.5, 71.8, 95.0, 118.3, 141.5, 164.8]
 mmu_servo_angles = {'down': 55, 'up': 148, 'move': 110}
 mmu_state_enable_endless_spool = 1
-mmu_state_endless_spool_groups = [0, 0, 1, 1, 1, 1, 1, 1]
+mmu_state_endless_spool_groups = [0, 1, 2, 3, 4, 5, 6, 7]
 mmu_state_filament_pos = 10
 mmu_state_filament_remaining = 0.0
 mmu_state_filament_remaining_color = ''
-mmu_state_gate_selected = -2
-mmu_state_gate_status = [2, -1, 0, 0, 0, 0, 0, 0]
+mmu_state_gate_color = ['', '', '', '', '', '', '', '']
+mmu_state_gate_filament_name = ['', '', '', '', '', '', '', '']
+mmu_state_gate_material = ['', '', '', '', '', '', '', '']
+mmu_state_gate_selected = 5
+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, 0, 0, 0, 0, 0, 0]
+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_selected = 5
 mmu_state_tool_to_gate_map = [0, 1, 2, 3, 4, 5, 6, 7]
-mmu_statistics_counters = {'servo_down': {'count': 265, 'limit': 5000, 'warning': 'Inspect servo arm for wear/damage', 'pause': False}, 'mmu_restarts': {'count': 69, 'limit': -1, 'warning': ''}, 'cutter_blade': {'count': 43, 'limit': 3000, 'warning': 'Inspect/replace filament cutting blade', 'pause': False}}
+mmu_statistics_counters = {'servo_down': {'count': 378, 'limit': 5000, 'warning': 'Inspect servo arm for wear/damage', 'pause': False}, 'mmu_restarts': {'count': 78, 'limit': -1, 'warning': ''}, 'cutter_blade': {'count': 43, '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}