diff --git a/klicky-variables.cfg b/klicky-variables.cfg
index 0688e2e..5f154d4 100644
--- a/klicky-variables.cfg
+++ b/klicky-variables.cfg
@@ -29,8 +29,10 @@ variable_max_bed_x:            350    # maximum Bed size avoids doing a probe_ac
 # if a separate Z endstop switch is in
 # use, specify the coordinates of the switch here (Voron).
 # Set to 0 to have the probe move to center of bed
-variable_z_endstop_x:          232
-variable_z_endstop_y:          355	
+#variable_z_endstop_x:          232
+#variable_z_endstop_y:          355	
+variable_z_endstop_x:          0
+variable_z_endstop_y:          0	
 
 #Check the printer specific documentation on klipper Dock/Undock configuration, these are dummy values
 #dock location
diff --git a/printer.cfg b/printer.cfg
index 48237c3..f3a3463 100644
--- a/printer.cfg
+++ b/printer.cfg
@@ -185,7 +185,9 @@ enable_pin: !z:P2.1
 rotation_distance: 40
 gear_ratio: 80:16
 microsteps: 32
-endstop_pin: z:P1.25
+#endstop_pin: z:P1.25
+endstop_pin: probe:z_virtual_endstop
+
 ##  Z-position of nozzle (in mm) to z-endstop trigger point relative to print surface (Z0)
 ##  (+) value = endstop above Z0, (-) value = endstop below
 ##  Increasing position_endstop brings nozzle closer to the bed
@@ -338,7 +340,7 @@ pullup_resistor: 6000
 ##  Adjust max_power so it doesn't exceed the SSR rating. The Omron G3NA-210B-DC5 SSR is rated at 4 amps without a heatsink.
 ##  The formula is "4 / (Wattage_of_bed_heater / Mains_voltage) = max_power"
 ##  If max_power is greater than 1.0, use 1.0
-max_power: 0.6
+max_power: 1.0
 min_temp: 0
 max_temp: 120
 control = pid
@@ -357,8 +359,8 @@ pid_kd = 266.452
 pin: z:P1.24
 x_offset: 0
 y_offset: 19.75 
-z_offset: 5
-speed: 10.0
+z_offset: 7.773
+speed: 5.0
 samples: 3
 samples_result: median
 sample_retract_dist: 2.0
@@ -489,14 +491,14 @@ retries: 5
 retry_tolerance: 0.0075
 max_adjust: 15
 
-[z_calibration]
-nozzle_xy_position: 232,355 # <X,Y position for clicking the nozzle on the z endstop - not needed if [safe_z_home] is used>
-switch_xy_offsets:  -4,-24 # <X,Y offsets from the nozzle position for clicking the probe's switch body on the z endstop>
-bed_xy_position:    180,180 # <X,Y position for probing the bed, for instance the center point - not needed if mesh with zero_reference_position is used>
-switch_offset:        0.5   # <offset of the switch trigger (read the Switch Offset section!)>
-start_gcode:          Attach_Probe # <macro name for attaching the probe>
+#[z_calibration]
+#nozzle_xy_position: 232,355 # <X,Y position for clicking the nozzle on the z endstop - not needed if [safe_z_home] is used>
+#switch_xy_offsets:  -4,-24 # <X,Y offsets from the nozzle position for clicking the probe's switch body on the z endstop>
+#bed_xy_position:    180,180 # <X,Y position for probing the bed, for instance the center point - not needed if mesh with zero_reference_position is used>
+#switch_offset:        0.5   # <offset of the switch trigger (read the Switch Offset section!)>
+#start_gcode:          Attach_Probe # <macro name for attaching the probe>
 #before_switch_gcode: <macro name for attaching the probe AFTER probing the nozzle>
-end_gcode:            Dock_Probe # <macro name for docking the probe>
+#end_gcode:            Dock_Probe # <macro name for docking the probe>
 
 #####################################################################
 #   Displays
@@ -623,8 +625,6 @@ gcode:
 
     CLEAN_NOZZLE
     
-    G28 Z                           # Homes Z again after QGL
-
     ##  Uncomment for Klicky auto-z
     SET_DISPLAY_TEXT MSG="Z-offset"             # Displays info
     CALIBRATE_Z                                 # Calibrates Z-offset with klicky
@@ -643,6 +643,10 @@ gcode:
     M107                                                          # Turns off partcooling fan
     M109 S{target_extruder}                                       # Heats the nozzle to printing temp
 
+
+    # get rid of any ooze during heating
+    CLEAN_NOZZLE
+    
     # enable filament sensor
     SFS_ENABLE
 
@@ -653,10 +657,10 @@ gcode:
     G0 Z0.4                                          # Raises Z to 0.4
     G92 E0 ; Reset Extruder
     G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed
-    G1 X0.5 Y20 Z0.3 F5000.0 ; Move to start position
-    G1 X0.5 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line
-    G1 X0.9 Y200.0 Z0.3 F5000.0 ; Move to side a little
-    G1 X0.9 Y20 Z0.3 F1500.0 E15 ; Draw the second line
+    G1 X2.5 Y20 Z0.3 F5000.0 ; Move to start position
+    G1 X2.5 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line
+    G1 X2.9 Y200.0 Z0.3 F5000.0 ; Move to side a little
+    G1 X2.9 Y20 Z0.3 F1500.0 E15 ; Draw the second line
     G92 E0 ; Reset Extruder
 
 
@@ -702,10 +706,11 @@ shaper_type: mzv      # first recommended shaper
 
 [bed_mesh]
 speed: 120
-horizontal_move_z: 5
+horizontal_move_z: 10
 mesh_min: 25, 25
 mesh_max: 325, 325
 probe_count: 6, 6
+zero_reference_position: 180, 180
 
 [filament_motion_sensor SFS_T0]
 detection_length: 10.00 ; This can be adjusted to your desired level of sensitivity. 10 is a recommended value to prevent flow dropoff false triggers.
@@ -871,11 +876,11 @@ gcode:
     RESTORE_GCODE_STATE NAME=TEST_SPEED
 
 [gcode_macro CLEAN_NOZZLE]
-variable_start_x: 120
+variable_start_x: 115
 variable_start_y: 355
-variable_start_z: 1.5
-variable_wipe_dist: -45
-variable_wipe_dy: 2
+variable_start_z: 1 
+variable_wipe_dist: -35
+variable_wipe_dy: 3 
 variable_wipe_qty: 10
 variable_wipe_spd: 200
 variable_raise_distance: 30
@@ -904,7 +909,7 @@ gcode:
 #*# DO NOT EDIT THIS BLOCK OR BELOW. The contents are auto-generated.
 #*#
 #*# [stepper_z]
-#*# position_endstop = -1.3
+#*# position_endstop = -0.8
 #*#
 #*# [probe]
 #*# z_offset = 2.375