diff --git a/klipper-printer-sovol-sv06.cfg b/klipper-printer-sovol-sv06.cfg
index fd89d13..8c55065 100644
--- a/klipper-printer-sovol-sv06.cfg
+++ b/klipper-printer-sovol-sv06.cfg
@@ -1,217 +1,224 @@
-# This file contains pin mappings for the stock Sovol SV06
-# To use this config, during "make menuconfig" select the 
-# STM32F103 with a "28KiB bootloader" and serial (on USART1 PA10/PA9) communication.
-# Also, since it is using the GD32F103, please select Disable SWD at startup
-
-# Flash this firmware by copying "out/klipper.bin" to a SD card and
-# turning on the printer with the card inserted. The firmware
-# filename must end in ".bin" and must not match the last filename
-# that was flashed.
-
-# See docs/Config_Reference.md for a description of parameters.
-
-[include ./macros/macros.cfg]
-[include ./macros/TEST_SPEED.cfg]
-[include ./macros/PARKING.cfg]
-[include ./macros/MECHANICAL_GANTRY_CALIBRATION.cfg]
-# Uncomment the following line if you're using an adxl345, and have it setup
-# [include ./adxl-rp2040.cfg]
-
-[mcu]
-# Obtain definition by "ls -l /dev/serial/by-id/"
-serial: /dev/serial/by-id/usb-1a86_USB2.0-Serial-if00-port0
-# restart_method: command # NOTE is this needed?
-
-[printer]
-kinematics: cartesian
-max_velocity: 300
-max_accel: 3000
-max_accel_to_decel: 1500
-max_z_velocity: 5
-max_z_accel: 100
-# square_corner_velocity: 6.0
-
-#####################################################################
-#      X/Y Stepper Settings
-#####################################################################
-
-[stepper_x]
-step_pin: PC2
-dir_pin: !PB9
-enable_pin: !PC3
-microsteps: 16
-rotation_distance: 40
-endstop_pin: tmc2209_stepper_x:virtual_endstop
-position_endstop: 0
-position_max: 225
-homing_speed: 40
-homing_retract_dist: 0
-
-[tmc2209 stepper_x]
-uart_pin: PC1
-run_current: 0.860
-stealthchop_threshold: 0
-interpolate: False
-sense_resistor: 0.150
-uart_address: 3
-driver_SGTHRS: 81
-diag_pin: PA5
-
-[stepper_y]
-step_pin: PB8
-dir_pin: PB7
-enable_pin: !PC3
-microsteps: 16
-rotation_distance: 40
-endstop_pin: tmc2209_stepper_y:virtual_endstop
-position_endstop: 0
-position_max: 225
-homing_speed: 40
-homing_retract_dist: 0
-
-[tmc2209 stepper_y]
-uart_pin: PC0
-run_current: 0.900
-stealthchop_threshold: 0
-interpolate: False
-sense_resistor: 0.150
-uart_address: 3
-driver_SGTHRS: 82
-diag_pin: PA6
-
-#####################################################################
-#   Z Stepper Settings
-#####################################################################
-
-[stepper_z]
-step_pin: PB6
-dir_pin: !PB5
-enable_pin: !PC3
-microsteps: 16
-rotation_distance: 4
-endstop_pin: probe:z_virtual_endstop
-position_min: -4
-position_max: 261
-homing_speed: 4
-
-[tmc2209 stepper_z]
-uart_pin: PA15
-run_current: 1.000
-stealthchop_threshold: 0
-interpolate: False
-sense_resistor: 0.150
-uart_address: 3
-diag_pin: PA7
-
-#####################################################################
-#   Extruder
-#####################################################################
-
-[extruder]
-max_extrude_only_distance: 150.0
-step_pin: PB4
-dir_pin: !PB3
-enable_pin: !PC3
-microsteps: 16
-rotation_distance: 4.56
-nozzle_diameter: 0.400
-filament_diameter: 1.750
-heater_pin: PA1
-sensor_type: sovol_thermistor
-sensor_pin: PC5
-control: pid
-pid_kd: 86.991
-pid_kp: 21.479
-pid_ki: 1.326
-min_temp: 0
-max_temp: 300
-# min_extrude_temp: 190 # TODO enable after initial setup
-
-[tmc2209 extruder]
-uart_pin: PC14
-run_current: 0.550
-stealthchop_threshold: 0
-interpolate: False
-sense_resistor: 0.150
-uart_address: 3
-
-#####################################################################
-#   Probe Related
-#####################################################################
-
-[probe]
-pin: PB1
-x_offset: 27
-y_offset: -20
-z_offset: 0
-speed: 7
-samples: 3
-samples_tolerance: 0.01
-samples_tolerance_retries: 10
-
-[safe_z_home]
-home_xy_position: 83,90
-speed: 60.0
-z_hop: 10
-z_hop_speed: 5
-
-[bed_mesh]
-speed: 120
-mesh_min: 30, 23
-mesh_max: 214, 214
-probe_count: 25
-algorithm: bicubic
-fade_start: 1
-fade_end: 10
-fade_target: 0
-
-#####################################################################
-#   Misc
-#####################################################################
-
-# [input_shaper]
-# shaper_freq_x: 46.948 
-# shaper_type_x: mzv
-# shaper_freq_y: 52.493
-# shaper_type_y: mzv
-# shaper_type: ei
-
-[virtual_sdcard]
-path: /home/pi/printer_data/gcodes
-
-[temperature_sensor mcu_temp]
-sensor_type: temperature_mcu
-min_temp: 25
-max_temp: 80
-
-[temperature_sensor raspberry_pi]
-sensor_type: temperature_host
-min_temp: 25
-max_temp: 80 
-
-[thermistor sovol_thermistor]
-temperature1: 25
-resistance1: 94162
-beta: 4160
-
-[heater_bed]
-heater_pin: PA2
-sensor_type: EPCOS 100K B57560G104F
-sensor_pin: PC4
-control: pid
-pid_kp: 64.440
-pid_ki: 0.773
-pid_kd: 1343.571
-min_temp: 0
-max_temp: 130
-
-[fan]
-pin: PA0
-
-[display]
-lcd_type: st7920
-cs_pin: PB12
-sclk_pin: PB13
-sid_pin: PB15
-encoder_pins: ^PB14, ^PB10
-click_pin: ^!PB2
\ No newline at end of file
+# This file contains pin mappings for the stock Sovol SV06
+# To use this config, during "make menuconfig" select the 
+# STM32F103 with a "28KiB bootloader" and serial (on USART1 PA10/PA9) communication.
+# Also, since it is using the GD32F103, please select Disable SWD at startup
+
+# Flash this firmware by copying "out/klipper.bin" to a SD card and
+# turning on the printer with the card inserted. The firmware
+# filename must end in ".bin" and must not match the last filename
+# that was flashed.
+
+# See docs/Config_Reference.md for a description of parameters.
+
+[include ./macros/macros.cfg]
+[include ./macros/TEST_SPEED.cfg]
+[include ./macros/PARKING.cfg]
+[include ./macros/MECHANICAL_GANTRY_CALIBRATION.cfg]
+# Uncomment the following line if you're using an adxl345, and have it setup
+# [include ./adxl-rp2040.cfg]
+
+[mcu]
+# Obtain definition by "ls -l /dev/serial/by-id/"
+serial: /dev/serial/by-id/usb-1a86_USB2.0-Serial-if00-port0
+restart_method: command
+
+[printer]
+kinematics: cartesian
+max_velocity: 300
+max_accel: 3000
+max_accel_to_decel: 1500
+max_z_velocity: 5
+max_z_accel: 100
+# square_corner_velocity: 6.0
+
+#####################################################################
+#      X/Y Stepper Settings
+#####################################################################
+
+[stepper_x]
+step_pin: PC2
+dir_pin: !PB9
+enable_pin: !PC3
+microsteps: 16
+rotation_distance: 40
+endstop_pin: tmc2209_stepper_x:virtual_endstop
+position_endstop: 0
+position_max: 225
+homing_speed: 40
+homing_retract_dist: 0
+
+[tmc2209 stepper_x]
+uart_pin: PC1
+run_current: 0.860
+stealthchop_threshold: 0
+interpolate: False
+sense_resistor: 0.150
+uart_address: 3
+driver_SGTHRS: 81
+diag_pin: PA5
+
+[stepper_y]
+step_pin: PB8
+dir_pin: PB7
+enable_pin: !PC3
+microsteps: 16
+rotation_distance: 40
+endstop_pin: tmc2209_stepper_y:virtual_endstop
+position_endstop: 0
+position_max: 225
+homing_speed: 40
+homing_retract_dist: 0
+
+[tmc2209 stepper_y]
+uart_pin: PC0
+run_current: 0.900
+stealthchop_threshold: 0
+interpolate: False
+sense_resistor: 0.150
+uart_address: 3
+driver_SGTHRS: 82
+diag_pin: PA6
+
+#####################################################################
+#   Z Stepper Settings
+#####################################################################
+
+[stepper_z]
+step_pin: PB6
+dir_pin: !PB5
+enable_pin: !PC3
+microsteps: 16
+rotation_distance: 4
+endstop_pin: probe:z_virtual_endstop
+position_min: -4
+position_max: 261
+homing_speed: 4
+
+[tmc2209 stepper_z]
+uart_pin: PA15
+run_current: 1.000
+stealthchop_threshold: 0
+interpolate: False
+sense_resistor: 0.150
+uart_address: 3
+diag_pin: PA7
+
+#####################################################################
+#   Extruder
+#####################################################################
+
+[extruder]
+step_pin: PB4
+dir_pin: !PB3
+enable_pin: !PC3
+microsteps: 16
+rotation_distance: 4.56
+nozzle_diameter: 0.400
+filament_diameter: 1.750
+heater_pin: PA1
+sensor_type: sovol_thermistor
+sensor_pin: PC5
+min_temp: 0
+max_temp: 270
+min_extrude_temp: 190
+max_extrude_only_distance: 150.0
+
+[tmc2209 extruder]
+uart_pin: PC14
+run_current: 0.550
+stealthchop_threshold: 0
+interpolate: False
+sense_resistor: 0.150
+uart_address: 3
+
+#####################################################################
+#   Probe Related
+#####################################################################
+
+[probe]
+pin: PB1
+x_offset: 27
+y_offset: -20
+z_offset: 0
+speed: 7
+samples: 3
+samples_tolerance: 0.01
+samples_tolerance_retries: 10
+
+[safe_z_home]
+home_xy_position: 83,90
+speed: 60.0
+z_hop: 10
+z_hop_speed: 5
+
+[bed_mesh]
+speed: 120
+mesh_min: 30, 23
+mesh_max: 214, 214
+probe_count: 25
+algorithm: bicubic
+fade_start: 1
+fade_end: 10
+fade_target: 0
+
+#####################################################################
+#   Misc
+#####################################################################
+
+# [input_shaper]
+# shaper_freq_x: 46.948 
+# shaper_type_x: mzv
+# shaper_freq_y: 52.493
+# shaper_type_y: mzv
+# shaper_type: ei
+
+[virtual_sdcard]
+path: /home/pi/printer_data/gcodes
+
+[temperature_sensor mcu_temp]
+sensor_type: temperature_mcu
+min_temp: 25
+max_temp: 80
+
+[temperature_sensor raspberry_pi]
+sensor_type: temperature_host
+min_temp: 25
+max_temp: 80 
+
+[thermistor sovol_thermistor]
+temperature1: 25
+resistance1: 94162
+beta: 4160
+
+[heater_bed]
+heater_pin: PA2
+sensor_type: EPCOS 100K B57560G104F
+sensor_pin: PC4
+min_temp: 0
+max_temp: 110
+
+[fan]
+pin: PA0
+
+[display]
+lcd_type: st7920
+cs_pin: PB12
+sclk_pin: PB13
+sid_pin: PB15
+encoder_pins: ^PB14, ^PB10
+click_pin: ^!PB2
+
+#*# <---------------------- SAVE_CONFIG ---------------------->
+#*# DO NOT EDIT THIS BLOCK OR BELOW. The contents are auto-generated.
+#*#
+#*# [extruder]
+#*# control = pid
+#*# pid_kp = 21.047
+#*# pid_ki = 1.477
+#*# pid_kd = 74.981
+#*#
+#*# [heater_bed]
+#*# control = pid
+#*# pid_kp = 71.224
+#*# pid_ki = 1.341
+#*# pid_kd = 945.503
diff --git a/printer.cfg b/printer.cfg
index 045cbd4..8c55065 100644
--- a/printer.cfg
+++ b/printer.cfg
@@ -108,7 +108,6 @@ diag_pin: PA7
 #####################################################################
 
 [extruder]
-max_extrude_only_distance: 150.0
 step_pin: PB4
 dir_pin: !PB3
 enable_pin: !PC3
@@ -119,13 +118,10 @@ filament_diameter: 1.750
 heater_pin: PA1
 sensor_type: sovol_thermistor
 sensor_pin: PC5
-#control: pid
-#pid_kd: 86.991
-#pid_kp: 21.479
-#pid_ki: 1.326
 min_temp: 0
 max_temp: 270
-# min_extrude_temp: 190 # TODO enable after initial setup
+min_extrude_temp: 190
+max_extrude_only_distance: 150.0
 
 [tmc2209 extruder]
 uart_pin: PC14
@@ -200,11 +196,6 @@ sensor_type: EPCOS 100K B57560G104F
 sensor_pin: PC4
 min_temp: 0
 max_temp: 110
-#control: pid
-#pid_kp: 64.440
-#pid_ki: 0.773
-#pid_kd: 1343.571
-
 
 [fan]
 pin: PA0