diff --git a/input_shaper.cfg b/input_shaper.cfg
index fe69194..6a5c041 100644
--- a/input_shaper.cfg
+++ b/input_shaper.cfg
@@ -4,9 +4,9 @@
 #    is mzv input shaper.
 # shaper_type: mzv
 shaper_type_x: mzv
-shaper_freq_x: 55.4
+shaper_freq_x: 53.6
 shaper_type_y: mzv
-shaper_freq_y: 43.6
+shaper_freq_y: 43.2
 #    Damping ratios of vibrations of X and Y axes used by input shapers
 #    to improve vibration suppression. Default value is 0.1 which is a
 #    good all-round value for most printers. In most circumstances this
diff --git a/macros/print.cfg b/macros/print.cfg
index 0474253..7d4a81b 100644
--- a/macros/print.cfg
+++ b/macros/print.cfg
@@ -18,8 +18,8 @@
 gcode:
   {% set x0=250 %}
   {% set x1=200 %}
-  {% set y0=309 %}
-  {% set z0=1.5 %}
+  {% set y0=309.5 %}
+  {% set z0=1.0 %}
   {% set z_hop = printer['gcode_macro _USER_VARIABLE'].z_hop|int %}
   {% if "xyz" in printer.toolhead.homed_axes %}
     G0 Z{z_hop} F1000           # move Z to travel height
@@ -116,7 +116,6 @@ gcode:
 [gcode_macro PRINT_START]
 gcode:
   {% set BED=params.BED|default(100)|int %}
-  {% set BED10=params.BED|default(100)|int - 10 %}
   {% set EXTRUDER=params.EXTRUDER|default(250)|int %}
   {% set BMC=params.BMC|default(0)|int %}
   {% set SHEET=params.SHEET|default("default")|string %}
@@ -128,8 +127,8 @@ gcode:
   M117 CONFIGURING
   M118 CONFIGURING
   SET_GCODE_OFFSET Z=0.0  # reset z offset
-  M140 S{BED10}           # start bed heating to bed-10
-  # M104 S{EXTRUDER}        # start extruder heating
+  M140 S{BED}             # start bed heating to bed
+  M104 S{EXTRUDER}        # start extruder heating
   G92 E0                  # reset extruder
   G21                     # set units to millimeters
   G90                     # use absolute coordinates
@@ -166,15 +165,11 @@ gcode:
 
   M117 CALIBRATE_Z
   M118 CALIBRATE_Z
+  G28 Z
   BRUSHIE
   CALIBRATE_Z
 
-  G92 E0                  # reset extruder
-  NOTIFY_BED BED={BED10}
-  M190 S{BED10}           # set and wait for bed-10 temperature
-
-  NOTIFY_EXTRUDER EXTRUDER={EXTRUDER}
-  M104 S{EXTRUDER}        # start extruder heating
+  G92 E0                  #  reset extruder
   NOTIFY_BED BED={BED}
   M190 S{BED}             # set and wait for actual bed temperature
   M109 S{EXTRUDER}        # set and wait for extruder temperature
diff --git a/z_calibration.cfg b/z_calibration.cfg
index 1c9c04c..4440a69 100644
--- a/z_calibration.cfg
+++ b/z_calibration.cfg
@@ -4,8 +4,8 @@
 [gcode_macro _USER_VARIABLE]
 description: Helper: Contains User defined printer variables
 ##### Homing and general movement #####
-variable_z_endstop_x: 94.5            ; z Endstop x position inside right profile
-variable_z_endstop_y: 307             ; z Endstop y position
+variable_z_endstop_x: 94              ; z Endstop x position inside right profile
+variable_z_endstop_y: 308             ; z Endstop y position
 variable_z_hop: 12                    ; z hop for moves e.g homing
 variable_xy_home_current: 0.6         ; reduced homing current for x and y
 variable_z_home_current: 0.5          ; reduced homing current for z
@@ -35,12 +35,12 @@ gcode:
 [z_calibration]
 #   The X and Y coordinates (in mm) for clicking the nozzle on the
 #   Z endstop.
-probe_nozzle_x: 94.5
-probe_nozzle_y: 307
+probe_nozzle_x: 94
+probe_nozzle_y: 308
 #   The X and Y coordinates (in mm) for clicking the probe's switch
 #   on the Z endstop.
 probe_switch_x: 90
-probe_switch_y: 287
+probe_switch_y: 288
 #   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
 #   probe's X and Y offsets. The default is the relative_reference_index
@@ -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.50
+switch_offset: 0.66
 #   The maximum allowed deviation of the calculated offset.
 #   If the offset exceeds this value, it will stop!
 #   The default is 1.0 mm.