diff --git a/fans.cfg b/fans.cfg
index bd6a288..2997c79 100644
--- a/fans.cfg
+++ b/fans.cfg
@@ -12,7 +12,7 @@ max_power: 1.0
 kick_start_time: 0.5
 heater: extruder
 heater_temp: 50.0
-fan_speed: 0.8
+fan_speed: 0.6
 
 [controller_fan driver_fan]
 ##	Controller Fan - FAN2 Connector
diff --git a/kiauh_macros.cfg b/kiauh_macros.cfg
index 9f4cf1f..3c75670 100644
--- a/kiauh_macros.cfg
+++ b/kiauh_macros.cfg
@@ -17,43 +17,6 @@ gcode:
     SDCARD_RESET_FILE
     BASE_CANCEL_PRINT
 
-[gcode_macro PAUSE]
-rename_existing: BASE_PAUSE
-gcode:
-    ##### set defaults #####
-    {% set x = params.X|default(230) %}      #edit to your park position
-    {% set y = params.Y|default(230) %}      #edit to your park position
-    {% set z = params.Z|default(10)|float %} #edit to your park position
-    {% set e = params.E|default(1) %}        #edit to your retract length
-    ##### calculate save lift position #####
-    {% set max_z = printer.toolhead.axis_maximum.z|float %}
-    {% set act_z = printer.toolhead.position.z|float %}
-    {% set lift_z = z|abs %}
-    {% if act_z < (max_z - lift_z) %}
-        {% set z_safe = lift_z %}
-    {% else %}
-        {% set z_safe = max_z - act_z %}
-    {% endif %}
-    ##### end of definitions #####
-    SAVE_GCODE_STATE NAME=PAUSE_state
-    BASE_PAUSE
-    G91
-    G1 E-{e} F2100
-    G1 Z{z_safe}
-    G90
-    G1 X{x} Y{y} F6000
-
-
-[gcode_macro RESUME]
-rename_existing: BASE_RESUME
-gcode:
-    ##### set defaults #####
-    {% set e = params.E|default(1) %} #edit to your retract length
-    G91
-    G1 E{e} F2100
-    G90
-    RESTORE_GCODE_STATE NAME=PAUSE_state MOVE=1
-    BASE_RESUME
 
 ################################################################################
 ################################################################################
diff --git a/moonraker.conf b/moonraker.conf
index 05e5bac..4c4f274 100644
--- a/moonraker.conf
+++ b/moonraker.conf
@@ -33,6 +33,8 @@ log_path: /home/kdb424/klipper_logs
 
 [octoprint_compat]
 
+[timelapse]
+
 [history]
 
 [update_manager]
diff --git a/printer.cfg b/printer.cfg
index 2662f83..a88333b 100644
--- a/printer.cfg
+++ b/printer.cfg
@@ -9,6 +9,7 @@
 [include fans.cfg]
 [include calibration_macros.cfg]
 [include purge_bucket.cfg]
+[include timelapse.cfg]
 
 [pause_resume]
 [display_status]
@@ -20,7 +21,7 @@ kinematics: corexy
 max_velocity: 1000
 max_accel: 15000
 max_accel_to_decel: 15000
-max_z_velocity: 30
+max_z_velocity: 80
 max_z_accel: 500
 square_corner_velocity: 8
 
@@ -29,7 +30,7 @@ serial: /dev/serial/by-id/usb-Klipper_stm32f446xx_2B0016000B50534E4E313120-if00
 
 [heater_bed]
 heater_pin: PA3
-sensor_type: Generic 3950
+sensor_type: NTC 100K MGB18-104F39050L32
 sensor_pin: PF3
 control: pid
 pid_Kp: 34.144
@@ -50,7 +51,7 @@ screw4: 312,0
 home_xy_position: 50, 331
 speed: 500.0
 z_hop: 10
-z_hop_speed: 15.0
+z_hop_speed: 30
 
 [firmware_retraction]
 retract_length: 0.2
@@ -59,6 +60,6 @@ unretract_speed: 80
 
 [input_shaper]
 shaper_type_x = mzv
-shaper_freq_x = 69.6
-shaper_type_y = mzv
-shaper_freq_y = 64
+shaper_freq_x = 69.4 # vibr=4.8 sm=0.04 accel=14200
+shaper_type_y = zv
+shaper_freq_y = 68.8 # vibr=1.4 sm=0.04 accel=18400
diff --git a/purge_bucket.cfg b/purge_bucket.cfg
index bcf8dd8..80f30ce 100644
--- a/purge_bucket.cfg
+++ b/purge_bucket.cfg
@@ -11,10 +11,10 @@ variable_enable_purge:              True
 # These parameters define your filament purging. The retract variable is used to retract right after purging to prevent unnecessary
 # oozing. Some filament are particularly oozy and may continue to ooze out of the nozzle for a second or two after retracting. The
 # ooze dwell variable makes allowance for this. Update as necessary. If you decided to not enable purge, you can ignore this section.
-variable_purge_len:            30		 ; Amount of filament, in mm, to purge.
-variable_purge_spd:            150		 ; Speed, in mm/min, of the purge.
+variable_purge_len:            50		 ; Amount of filament, in mm, to purge.
+variable_purge_spd:            300		 ; Speed, in mm/min, of the purge.
 variable_purge_temp_min:       220		 ; Minimum nozzle temperature to permit a purge. Otherwise, purge will not occur.
-variable_purge_ret:            1                 ; Retract length, in mm, after purging to prevent slight oozing. Adjust as necessary.
+variable_purge_ret:            2                 ; Retract length, in mm, after purging to prevent slight oozing. Adjust as necessary.
 variable_ooze_dwell:           1                 ; Dwell/wait time, in seconds, after purging and retracting.
 
 # Adjust this so that your nozzle scrubs within the brush. Currently defaulted to be a lot higher for safety. Be careful not to go too low!
@@ -24,7 +24,7 @@ variable_brush_top:            8
 # direction is randomized based off whether the left or right bucket is randomly selected in the purge & scrubbing routine.
 variable_clearance_z:          10		 ; When traveling, but not cleaning, the clearance along the z-axis between nozzle and brush.
 variable_wipe_qty:              3		 ; Number of complete (A complete wipe: left, right, left OR right, left, right) wipes.
-variable_prep_spd_xy:        3000		 ; Travel (not cleaning) speed along x and y-axis in mm/min.
+variable_prep_spd_xy:        6000		 ; Travel (not cleaning) speed along x and y-axis in mm/min.
 variable_prep_spd_z:         1500		 ; Travel (not cleaning) speed along z axis in mm/min.
 variable_wipe_spd_xy:        5000		 ; Nozzle wipe speed in mm/min.
 
diff --git a/sherpa_mini.cfg b/sherpa_mini.cfg
index 67c7a56..e298701 100644
--- a/sherpa_mini.cfg
+++ b/sherpa_mini.cfg
@@ -1,9 +1,9 @@
 # Extruder0
 [extruder]
 rotation_distance: 22.67895 #for 5mm Shaft Driven Bondtech gearsets
+microsteps: 16
 #gear_ratio: 50:10 #for standard 10t motor
 gear_ratio: 50:8 #for sherpa mini 8t motor
-microsteps: 16
 full_steps_per_rotation: 200 #1.8deg Motor
 
 nozzle_diameter: 0.5
@@ -24,13 +24,24 @@ sensor_type: PT1000
 sensor_pin: PF4
 
 control: pid
-pid_Kp = 18.940
-pid_Ki = 0.713
-pid_Kd = 125.716
+
+# Dragon HF
+pid_Kp=19.645
+pid_Ki=1.031
+pid_Kd=93.558
+
+# Alu
+# pid_Kp = 21.956
+# pid_Ki = 1.1031
+# pid_Kd = 116.914
+
+# Copper
+# pid_Kp = 18.940
+# pid_Ki = 0.713
+# pid_Kd = 125.716
 
 #settings for NEMA14 Stepper
 [tmc2209 extruder]
-interpolate: True
 uart_pin: PC7
 #Run current is listed in RMS
 #run_current: 0.30 #min current, equivalent to 0.42A peak (Peak = RMS/0.707)
diff --git a/stepper2209.cfg b/stepper2209.cfg
index e76921d..a0e088b 100644
--- a/stepper2209.cfg
+++ b/stepper2209.cfg
@@ -1,3 +1,4 @@
+#LDO 48mm 1.8 42STH48-2004AC - 1.4Ohm 3mH
 [tmc2209 stepper_x]
 uart_pin: PC4
 run_current: 1.5
@@ -5,11 +6,20 @@ sense_resistor: 0.110
 stealthchop_threshold: 0
 diag_pin: ^PG6      # Set to MCU pin connected to TMC DIAG pin
 driver_SGTHRS: 80  # 255 is most sensitive value, 0 is least sensitive
+driver_TBL: 1
+driver_TOFF: 3
+driver_HSTRT: 1
+driver_HEND: 3
 
+#LDO 48mm 1.8 42STH48-2004AC - 1.4Ohm 3mH
 [tmc2209 stepper_y]
 uart_pin: PD11
 run_current: 1.5
 sense_resistor: 0.110
 stealthchop_threshold: 0
 diag_pin: ^PG9      # Set to MCU pin connected to TMC DIAG pin
-driver_SGTHRS: 90  # 255 is most sensitive value, 0 is least sensitive
+driver_SGTHRS: 80  # 255 is most sensitive value, 0 is least sensitive
+driver_TBL: 1
+driver_TOFF: 3
+driver_HSTRT: 1
+driver_HEND: 3
diff --git a/stepper5160.cfg b/stepper5160.cfg
index 7ff9eef..88cc254 100644
--- a/stepper5160.cfg
+++ b/stepper5160.cfg
@@ -3,7 +3,6 @@ interpolate: false
 cs_pin: PC4
 #diag1_pin: PG12
 run_current: 1.8
-#hold_current: 0.5
 spi_bus: spi3
 driver_SGT: 1
 sense_resistor: 0.075
@@ -13,7 +12,6 @@ interpolate: false
 cs_pin: PF12
 #diag1_pin: PG11
 run_current: 1.8
-#hold_current: 0.5
 spi_bus: spi3
 driver_SGT: 1
 sense_resistor: 0.075
diff --git a/steppers.cfg b/steppers.cfg
index 0315cf8..bfc9919 100644
--- a/steppers.cfg
+++ b/steppers.cfg
@@ -21,13 +21,13 @@ enable_pin: !PF15
 endstop_pin: tmc2209_stepper_y:virtual_endstop
 microsteps: 16
 rotation_distance: 40
-position_endstop: 0
+position_endstop: 331
 position_min: 0
 position_max: 331
 homing_speed: 40
 full_steps_per_rotation: 200
 homing_retract_dist: 0
-homing_positive_dir: false
+homing_positive_dir: true
 step_pulse_duration: 0.000001
 
 [stepper_z]
@@ -37,12 +37,12 @@ enable_pin: !PG5
 microsteps: 16
 rotation_distance: 4
 endstop_pin: PG10
-position_endstop: -1
-position_min: -1
+position_endstop: -1.1
+position_min: -1.1
 position_max: 400
 full_steps_per_rotation: 200
 homing_retract_dist: 5.0
 homing_positive_dir: false
-homing_speed: 5.0
-second_homing_speed: 2.5
+homing_speed: 8
+second_homing_speed: 3
 step_pulse_duration: 0.000004
diff --git a/stepperz.cfg b/stepperz.cfg
index e30a763..966c98c 100644
--- a/stepperz.cfg
+++ b/stepperz.cfg
@@ -7,6 +7,10 @@ run_current: 0.8
 hold_current: 0.8
 sense_resistor: 0.110
 stealthchop_threshold: 0
+driver_TBL: 1
+driver_TOFF: 3
+driver_HSTRT: 0
+driver_HEND: 3
 
 [endstop_phase stepper_z]
 trigger_phase = 22/64