diff --git a/macros/print.cfg b/macros/print.cfg
index 649cd5e..e99d040 100644
--- a/macros/print.cfg
+++ b/macros/print.cfg
@@ -3,6 +3,7 @@
 # - BRUSHIE
 # - CANCEL_PRINT
 # - M600
+# - M900
 # - PARK
 # - PAUSE
 # - PRINT_START
@@ -15,15 +16,15 @@
 # BRUSHIE
 [gcode_macro BRUSHIE]
 gcode:
-  {% set x0=40 %}
-  {% set x1=110 %}
-  {% set y0=305 %}
+  {% set x0=200 %}
+  {% set x1=250 %}
+  {% set y0=306 %}
   {% set z0=1 %}
   {% set z_hop = printer['gcode_macro _USER_VARIABLE'].z_hop|int %}
   {% if "xyz" in printer.toolhead.homed_axes %}
     M117 > brushie brushie brushie
     G0 Z{z_hop} F1000           # move Z to travel height
-    G0 X{x0} Y{y0} F5000        # move to x0/y0
+    G0 X{x0} Y{y0} F6000        # move to x0/y0
     G0 Z{z0}                    # lower
     G0 X{x1}                    # back
     G0 X{x0}                    # forth
@@ -52,6 +53,11 @@ gcode:
   M117 > change filament
   RESTORE_GCODE_STATE NAME=M600_state
 
+[gcode_macro M900]
+description: Set pressure advance
+gcode:
+  SET_PRESSURE_ADVANCE ADVANCE={params.K|default(0)}
+
 
 # PARK
 [gcode_macro PARK]
@@ -111,14 +117,14 @@ gcode:
   {% set BED=params.BED|default(100)|int %}
   {% set EXTRUDER=params.EXTRUDER|default(250)|int %}
   {% set CHAMBER=params.CHAMBER|default(0)|int %}
+  {% set QGL=params.QGL|default(1)|int %}
   {% set BMC=params.BMC|default(0)|int %}
-  {% set QGL=params.QGL|default(0)|int %}
   {% set PURGE=params.PURGE|default(1)|int %}
   {% set SOAK=params.SOAK|default(0)|int * 1000 * 60 %}
   {% set Z_ADJUST=params.Z_ADJUST|default(0.0)|float %}
   # TODO: ERCF
   {% set ERCF=params.ERCF|default(0) %}
-  {action_respond_info("starting print BED=%d, EXTRUDER=%d, BMC=%d, PURGE=%d, SOAK=%d, Z_AJUST=%f" % (BED, EXTRUDER, BMC, PURGE, SOAK, Z_ADJUST))}
+  {action_respond_info("starting print BED=%d, EXTRUDER=%d, CHAMBER=%d, QGL=%d, BMC=%d, PURGE=%d, SOAK=%d, Z_AJUST=%f" % (BED, EXTRUDER, CHAMBER, QGL, BMC, PURGE, SOAK, Z_ADJUST))}
   M117 > configuring
   SET_LED LED=caselight RED=0.00 GREEN=0.00 BLUE=0.50
   G4 P2000
@@ -167,6 +173,7 @@ gcode:
   {% endif %}
 
   M117 > starting
+  SET_PRESSURE_ADVANCE ADVANCE=0.05
   SET_GCODE_OFFSET Z_ADJUST={params.Z_ADJUST|default(0.0)|float} MOVE=1
   SET_LED LED=caselight RED=0.50 GREEN=0.50 BLUE=0.50
   G4 P2000
diff --git a/printer.cfg b/printer.cfg
index de2d4d4..72fb61d 100644
--- a/printer.cfg
+++ b/printer.cfg
@@ -117,7 +117,7 @@ full_steps_per_rotation: 400  # 200: 1.8 deg stepper, 400: 0.9 deg stepper
 endstop_pin: PG9
 position_min: 0
 position_endstop: 305
-position_max: 305
+position_max: 306
 homing_speed: 30              # Max 100
 homing_retract_dist: 5
 homing_positive_dir: true
@@ -149,8 +149,8 @@ position_endstop: 0.5
 position_max: 290
 position_min: -5
 homing_speed: 13.0          # speed: mm/sec, feedrate: mm/min
-second_homing_speed: 4
-homing_retract_dist: 13
+second_homing_speed: 3
+homing_retract_dist: 3
 
 [tmc2209 stepper_z]
 uart_pin: PC6
@@ -291,15 +291,15 @@ max_temp: 120
 ## Microswitch probe
 pin: ^PG11
 x_offset: 0
-y_offset: 25.0
-z_offset: 10
-speed: 6
-lift_speed: 11
+y_offset: 30
+z_offset: 12
+speed: 3
+lift_speed: 25
 samples: 5
 samples_result: median
-sample_retract_dist: 3.0
+sample_retract_dist: 2.0
 samples_tolerance: 0.01
-samples_tolerance_retries: 3
+samples_tolerance_retries: 5
 
 
 #####################################################################
@@ -326,6 +326,13 @@ temperature1: 25
 resistance1: 10000
 beta: 3950
 
+[temperature_sensor MCU]
+sensor_type: temperature_mcu
+sensor_mcu: mcu
+min_temp: 0
+max_temp: 100
+# gcode_id: C
+
 
 [temperature_sensor chamber]
 sensor_type: chamber
@@ -334,7 +341,7 @@ min_temp: 0
 max_temp: 100
 gcode_id: C
 
-[temperature_sensor rpi]
+[temperature_sensor RPI]
 sensor_type: temperature_host
 min_temp: 0
 max_temp: 100
@@ -345,35 +352,42 @@ timeout: 1800
 ## replaced with homing_override in klicky-probe.cfg
 # [safe_z_home]
 # ## XY Location of the Z Endstop Switch
-# home_xy_position: 205, 305
+# home_xy_position: 94.5, 305
 # speed: 100
 # z_hop: 10
 # z_hop_speed: 25
 
 [bed_mesh]
 speed: 500
-horizontal_move_z: 15
-mesh_min: 40,60
-mesh_max: 260,280
-fade_start: 0.6
-fade_end: 10
-probe_count: 5,5
+horizontal_move_z: 12
+# 40, 40   -->  40 + probe.x_offset,  40 + probe.y_offset
+mesh_min: 40, 70
+# 260, 260 --> 260 + probe.x_offset, 260 + probe.y_offset
+mesh_max: 260,290
+# fade_start: 1
+# fade_end: 10
+# fade_target: 0
 algorithm: bicubic
 # relative_reference_index = ((x points * y points) - 1) / 2
-relative_reference_index: 12
+# 3x3: 4, 5x5: 12, 7x7: 24, 9x9: 40
+# probe_count: 3,3
+# relative_reference_index: 4
+# probe_count: 5,5
+# relative_reference_index: 9
+probe_count: 9,9
+relative_reference_index: 40
 
 [quad_gantry_level]
-## Use QUAD_GANTRY_LEVEL to level a gantry.
 gantry_corners:
   -60,-10
   360,370
 points:
-  50,40
-  50,225
-  250,225
-  250,40
+  40,40
+  40,260
+  260,260
+  260,40
 speed: 150
-horizontal_move_z: 15
+horizontal_move_z: 12
 retries: 5
 retry_tolerance: 0.0075
 max_adjust: 10
diff --git a/z_calibration.cfg b/z_calibration.cfg
index 6d7f749..798d04e 100644
--- a/z_calibration.cfg
+++ b/z_calibration.cfg
@@ -4,17 +4,17 @@
 [gcode_macro _USER_VARIABLE]
 description: Helper: Contains User defined printer variables
 ##### Homing and general movement #####
-variable_z_endstop_x: 205             ; z Endstop x position inside right profile
+variable_z_endstop_x: 94.5            ; z Endstop x position inside right profile
 variable_z_endstop_y: 305             ; z Endstop y position
 variable_z_hop: 12                    ; z hop for moves e.g homing
 variable_xy_home_current: 0.5         ; reduced homing current for x and y
 variable_z_home_current: 0.4          ; reduced homing current for z
 variable_home_accel: 1000             ; reduced ACCEL for homing
 ##### Mag Probe #####
-variable_probe_dock_x: 145            ; x toolhead position before docking probe
-variable_probe_dock_y: 285            ; y toolhead position before docking probe
+variable_probe_dock_x: 52             ; x toolhead position before docking probe
+variable_probe_dock_y: 250            ; y toolhead position before docking probe
 variable_probe_dock_z: 12             ; z toolhead position before docking probe (only for bed dock)
-variable_probe_undock_x: 200          ; x toolhead position after docking probe
+variable_probe_undock_x: 120          ; x toolhead position after docking probe
 variable_probe_undock_y: 305          ; y toolhead position after docking probe
 variable_probe_undock_z: 12           ; z toolhead position after docking probe (only for bed dock)
 variable_probe_z_min: 12              ; z minimum height to avoid crash
@@ -35,11 +35,11 @@ gcode:
 [z_calibration]
 #   The X and Y coordinates (in mm) for clicking the nozzle on the
 #   Z endstop.
-probe_nozzle_x: 205
+probe_nozzle_x: 94.5
 probe_nozzle_y: 305
 #   The X and Y coordinates (in mm) for clicking the probe's switch
 #   on the Z endstop.
-probe_switch_x: 201
+probe_switch_x: 90
 probe_switch_y: 284
 #   The X and Y coordinates (in mm) for probing on the print surface
 #   (e.g. the center point) These coordinates will be adapted by the
@@ -52,7 +52,7 @@ probe_bed_y: 150
 #   The trigger point offset of the used mag-probe switch.
 #   This needs to be fined out manually. More on this later
 #   in this section. smaller switch_offset -> more distance to  the build plate
-switch_offset: 0.75
+switch_offset: 0.72
 #   The maximum allowed deviation of the calculated offset.
 #   If the offset exceeds this value, it will stop!
 #   The default is 1.0 mm.
@@ -73,10 +73,10 @@ max_deviation: 1.0
 #   position. The default is two times the z_offset from the probe's
 #   configuration.
 #position_min: default from "stepper_z:position_min" section.
-#   The moving speed in X and Y. The default is 50 mm/s.
-#   Clearance
+#   Extra clearance when moving
 clearance: 12
-# speed: 200
+#   The moving speed in X and Y. The default is 50 mm/s.
+speed: 100
 #   Speed (in mm/s) of the Z axis when lifting the probe between
 #   samples and clearance moves. The default is from the probe's
 #   configuration.