diff --git a/.editorconfig b/.editorconfig
index beefb01c..bae2036a 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,3 +12,7 @@ indent_size = 2
 [*.tf]
 indent_style = space
 indent_size = 2
+
+[nixos/klipper/*.cfg]
+indent_style = space
+indent_size = 4
diff --git a/nixos/klipper/default.nix b/nixos/klipper/default.nix
index d9a45603..6f718c0c 100644
--- a/nixos/klipper/default.nix
+++ b/nixos/klipper/default.nix
@@ -17,6 +17,10 @@ in {
         ./ender3v3se.cfg
         ./macros.cfg
       ];
+      settings = {
+        # allow the z_offset to be saved by moonraker
+        bltouch.z_offset = mkDefault 1.85;
+      };
     };
   };
   systemd.services.klipper = mkIf cfg.enable {
diff --git a/nixos/klipper/ender3v3se.cfg b/nixos/klipper/ender3v3se.cfg
index 0ded10ed..24f3ffe9 100644
--- a/nixos/klipper/ender3v3se.cfg
+++ b/nixos/klipper/ender3v3se.cfg
@@ -3,11 +3,18 @@ control_pin:PC13
 pin_move_time:0.400000
 probe_with_touch_mode:true
 sensor_pin:^PC14
-speed:20
+speed:10
+lift_speed:40
+samples:2
 stow_on_each_sample:false
+
+# stock values from an example config
 x_offset:-23.000000
 y_offset:-14.500000
-z_offset:2.1
+
+# arc X/Y PROBE attempt #1 (unlikely to be perfect...)
+#x_offset:-24.8
+#y_offset:-16
 
 [dirzctl]
 
@@ -36,6 +43,11 @@ rotation_distance:7.440000
 sensor_pin:PC5
 sensor_type:EPCOS 100K B57560G104F
 step_pin:PB4
+# https://www.klipper3d.org/Pressure_Advance.html
+#pressure_advance:0.0295
+pressure_advance:0.0432
+#pressure_advance:0.0444
+pressure_advance_smooth_time:0.040
 
 [firmware_retraction]
 retract_length:1.2
@@ -95,7 +107,7 @@ wipe_retract_distance:2
 
 [safe_z_home]
 home_xy_position:134,123
-speed:150
+speed:50
 z_hop:10
 z_hop_speed:10
 
@@ -172,7 +184,7 @@ algorithm:bicubic
 horizontal_move_z:5
 mesh_max:207,215.5
 mesh_min:30,30
-probe_count:5,5
+probe_count:7,7
 speed:120
 
 [bed_mesh fallback]