diff --git a/system/KlipperS1Pro/machine/KlipperS1Pro_klipper.json b/system/KlipperS1Pro/machine/KlipperS1Pro_klipper.json
index 0f92b7e..3841a67 100644
--- a/system/KlipperS1Pro/machine/KlipperS1Pro_klipper.json
+++ b/system/KlipperS1Pro/machine/KlipperS1Pro_klipper.json
@@ -5,6 +5,7 @@
     "from": "system",
     "instantiation": "false",
     "gcode_flavor": "klipper",
+    "print_host": "mainsail:7125",
     "printable_area": [
         "0x0",
         "220x0",
diff --git a/system/KlipperS1Pro/machine/KlipperS1Pro_machine.json b/system/KlipperS1Pro/machine/KlipperS1Pro_machine.json
index cf16743..6d3c0fb 100644
--- a/system/KlipperS1Pro/machine/KlipperS1Pro_machine.json
+++ b/system/KlipperS1Pro/machine/KlipperS1Pro_machine.json
@@ -109,10 +109,9 @@
     "wipe": [
         "1"
     ],
-    "print_host": "mainsail:7125",
     "default_print_profile": "",
-    "machine_start_gcode": "G0 Z20 F9000\nG92 E0; G1 E-10 F1200\nG28\nM970 Q1 A10 B10 C130 K0\nM970 Q1 A10 B131 C250 K1\nM974 Q1 S1 P0\nM970 Q0 A10 B10 C130 H20 K0\nM970 Q0 A10 B131 C250 K1\nM974 Q0 S1 P0\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nG29 ;Home\nG90;\nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nM109 S205;\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder \nG1 X110 Y110 Z2.0 F3000 ;Move Z Axis up",
-    "machine_end_gcode": "M400 ; wait for buffer to clear\nG92 E0 ; zero the extruder\nG1 E-4.0 F3600; retract \nG91\nG1 Z3;\nM104 S0 ; turn off hotend\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nG90 \nG0 X110 Y200 F3600 \nprint_end",
+    "machine_start_gcode": "",
+    "machine_end_gcode": "",
     "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
     "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
     "machine_pause_gcode": "M601"
diff --git a/system/KlipperS1Pro/process/fdm_process_klipper_common.json b/system/KlipperS1Pro/process/fdm_process_klipper_common.json
index 233470d..9c8b7aa 100644
--- a/system/KlipperS1Pro/process/fdm_process_klipper_common.json
+++ b/system/KlipperS1Pro/process/fdm_process_klipper_common.json
@@ -5,5 +5,6 @@
     "from": "system",
     "instantiation": "false",
     "default_acceleration": "0",
-    "filename_format": "{input_filename_base}_{print_time}_{digits(layer_height,1,2)}mm_{nozzle_temperature[0]}C_{filament_type[0]}_orca.gcode"
-}
\ No newline at end of file
+    "filename_format": "{input_filename_base}_ND_{digits(nozzle_diameter[0], 1, 2)}mm_LH_{digits(layer_height,1,2)}mm_NT_{nozzle_temperature[0]}C_FP_{filament_preset[0]}_T_{print_time}_orca.gcode"
+}
+