diff --git a/K-ShakeTune/K-SnT_axis.cfg b/K-ShakeTune/K-SnT_axis.cfg
index 5d0c067..9cdb0a2 100644
--- a/K-ShakeTune/K-SnT_axis.cfg
+++ b/K-ShakeTune/K-SnT_axis.cfg
@@ -13,7 +13,7 @@ gcode:
     {% set scv = params.SCV|default(None) %}
     {% set max_sm = params.MAX_SMOOTHING|default(None) %}
     {% set keep_results = params.KEEP_N_RESULTS|default(3)|int %}
-    {% set keep_csv = params.KEEP_CSV|default(True) %}
+    {% set keep_csv = params.KEEP_CSV|default(0)|int %}
 
     {% set X, Y = False, False %}
 
@@ -27,10 +27,14 @@ gcode:
         { action_raise_error("AXIS selection invalid. Should be either all, x or y!") }
     {% endif %}
 
-    {% if scv is none %}
+    {% if scv is none or scv == "" %}
         {% set scv = printer.toolhead.square_corner_velocity %}
     {% endif %}
 
+    {% if max_sm == "" %}
+        {% set max_sm = none %}
+    {% endif %}
+
     {% if X %}
         TEST_RESONANCES AXIS=X OUTPUT=raw_data NAME=x FREQ_START={min_freq} FREQ_END={max_freq} HZ_PER_SEC={hz_per_sec}
         M400
diff --git a/K-ShakeTune/K-SnT_belts.cfg b/K-ShakeTune/K-SnT_belts.cfg
index 551897c..cd4987c 100644
--- a/K-ShakeTune/K-SnT_belts.cfg
+++ b/K-ShakeTune/K-SnT_belts.cfg
@@ -10,7 +10,7 @@ gcode:
     {% set max_freq = params.FREQ_END|default(133.33)|float %}
     {% set hz_per_sec = params.HZ_PER_SEC|default(1)|float %}
     {% set keep_results = params.KEEP_N_RESULTS|default(3)|int %}
-    {% set keep_csv = params.KEEP_CSV|default(True) %}
+    {% set keep_csv = params.KEEP_CSV|default(0)|int %}
 
     TEST_RESONANCES AXIS=1,1 OUTPUT=raw_data NAME=b FREQ_START={min_freq} FREQ_END={max_freq} HZ_PER_SEC={hz_per_sec}
     M400
diff --git a/K-ShakeTune/K-SnT_vibrations.cfg b/K-ShakeTune/K-SnT_vibrations.cfg
index 3db9538..947be5f 100644
--- a/K-ShakeTune/K-SnT_vibrations.cfg
+++ b/K-ShakeTune/K-SnT_vibrations.cfg
@@ -15,7 +15,7 @@ gcode:
     {% set accel_chip = params.ACCEL_CHIP|default("adxl345") %} # ADXL chip name in the config
 
     {% set keep_results = params.KEEP_N_RESULTS|default(3)|int %}
-    {% set keep_csv = params.KEEP_CSV|default(True) %}
+    {% set keep_csv = params.KEEP_CSV|default(0)|int %}
 
     {% set mid_x = printer.toolhead.axis_maximum.x|float / 2 %}
     {% set mid_y = printer.toolhead.axis_maximum.y|float / 2 %}
diff --git a/docs/macros/axis_tuning.md b/docs/macros/axis_tuning.md
index b263813..a37168b 100644
--- a/docs/macros/axis_tuning.md
+++ b/docs/macros/axis_tuning.md
@@ -18,7 +18,7 @@ Then, call the `AXES_SHAPER_CALIBRATION` macro and look for the graphs in the re
 |SCV|printer square corner velocity|Square corner velocity you want to use to calculate shaper recommendations. Using higher SCV values usually results in more smoothing and lower maximum accelerations|
 |MAX_SMOOTHING|None|Max smoothing allowed when calculating shaper recommendations|
 |KEEP_N_RESULTS|3|Total number of results to keep in the result folder after running the test. The older results are automatically cleaned up|
-|KEEP_CSV|True|Weither or not to keep the CSV data file alonside the PNG graphs|
+|KEEP_CSV|0|Weither or not to keep the CSV data file alonside the PNG graphs|
 
 
 ## Graphs description
diff --git a/docs/macros/belts_tuning.md b/docs/macros/belts_tuning.md
index 70a4c75..225ed00 100644
--- a/docs/macros/belts_tuning.md
+++ b/docs/macros/belts_tuning.md
@@ -15,7 +15,7 @@ Then, call the `COMPARE_BELTS_RESPONSES` macro and look for the graphs in the re
 |FREQ_END|133|Maximum excitation frequency|
 |HZ_PER_SEC|1|Number of Hz per seconds for the test|
 |KEEP_N_RESULTS|3|Total number of results to keep in the result folder after running the test. The older results are automatically cleaned up|
-|KEEP_CSV|True|Weither or not to keep the CSV data files alonside the PNG graphs|
+|KEEP_CSV|0|Weither or not to keep the CSV data files alonside the PNG graphs|
 
 
 ## Graphs description
diff --git a/docs/macros/vibrations_profile.md b/docs/macros/vibrations_profile.md
index 3c21899..62c8975 100644
--- a/docs/macros/vibrations_profile.md
+++ b/docs/macros/vibrations_profile.md
@@ -21,7 +21,7 @@ Call the `CREATE_VIBRATIONS_PROFILE` macro with the speed range you want to meas
 |TRAVEL_SPEED|200|speed in mm/s used for all the travels moves|
 |ACCEL_CHIP|"adxl345"|accelerometer chip name in the config|
 |KEEP_N_RESULTS|3|Total number of results to keep in the result folder after running the test. The older results are automatically cleaned up|
-|KEEP_CSV|True|Weither or not to keep the CSV data files alonside the PNG graphs (archived in a tarball)|
+|KEEP_CSV|0|Weither or not to keep the CSV data files alonside the PNG graphs (archived in a tarball)|
 
 
 ## Graphs description