diff --git a/js/kiri-conf.js b/js/kiri-conf.js
index 655b26f0..cf128ae0 100644
--- a/js/kiri-conf.js
+++ b/js/kiri-conf.js
@@ -10,7 +10,7 @@ let gs_kiri_conf = exports;
     if (self.kiri.conf) return;
 
     let KIRI = self.kiri,
-        CVER = 2;
+        CVER = 185;
 
     function genID() {
         while (true) {
@@ -96,7 +96,7 @@ let gs_kiri_conf = exports;
             gcodeSpindle: valueOf(cmd.spindle, []),
             gcodeChange: valueOf(code['tool-change'], []),
             gcodeFExt: valueOf(code['file-ext'], 'gcode'),
-            gcodeSpace: valueOf(code['token-space'], ''),
+            gcodeSpace: valueOf(code['token-space'], true),
             gcodeStrip: valueOf(code['strip-comments'], false),
             gcodeLaserOn: valueOf(code['laser-on'], []),
             gcodeLaserOff: valueOf(code['laser-off'], []),
@@ -156,7 +156,7 @@ let gs_kiri_conf = exports;
         }
 
         // v1 to v2 changed FDM extruder / nozzle / filament structure
-        if (settings.ver === 1) {
+        if (settings.ver != CVER) {
             // backup settings before upgrade
             API.sdb.setItem(`ws-settings-${Date.now()}`, JSON.stringify(settings));
             device_v1_to_v2(settings.device);
@@ -164,7 +164,7 @@ let gs_kiri_conf = exports;
             objectMap(settings.devices, dev => {
                 return device_from_code(dev);
             });
-            settings.ver = 2;
+            settings.ver = CVER;
         }
 
         fill_cull(settings, defaults, defaults);
@@ -463,7 +463,7 @@ let gs_kiri_conf = exports;
                 gcodeTrack: "",     // FDM progress command
                 gcodeLayer: [],     // FDM layer output
                 gcodeFExt: "",      // CAM file extension
-                gcodeSpace: "",     // CAM token spacing
+                gcodeSpace: true,   // CAM token spacing
                 gcodeStrip: true,   // CAM strip comments
                 gcodeDwell: ["G4 P{time}"],     // CAM dwell script
                 gcodeChange: ["M6 T{tool}"],    // CAM tool change script
diff --git a/js/kiri-driver-cam.js b/js/kiri-driver-cam.js
index 1f9f38ec..62d196e2 100644
--- a/js/kiri-driver-cam.js
+++ b/js/kiri-driver-cam.js
@@ -1556,7 +1556,7 @@ var gs_kiri_cam = exports;
             settings = print.settings,
             device = settings.device,
             gcodes = settings.device || {},
-            space = gcodes.gcodeSpace,
+            space = gcodes.gcodeSpace ? ' ' : '',
             stripComments = gcodes.gcodeStrip || false,
             cmdToolChange = gcodes.gcodeChange || [ "M6 T{tool}" ],
             cmdSpindle = gcodes.gcodeSpindle || [ "M3 S{speed}" ],
diff --git a/js/kiri-driver-fdm.js b/js/kiri-driver-fdm.js
index 001b3658..e43f59ca 100644
--- a/js/kiri-driver-fdm.js
+++ b/js/kiri-driver-fdm.js
@@ -584,6 +584,7 @@ let gs_kiri_fdm = exports;
                 return start;
             } else {
                 console.log({already_purged: nozzle, from: track, layer});
+                return start;
             }
         }
 
@@ -616,6 +617,9 @@ let gs_kiri_fdm = exports;
                 found = 0;
                 closest = null;
                 mindist = Infinity;
+                // TODO must select slices of the same extruder type first
+                // instead of just finding closest, create sorted list and
+                // next is draw from list
                 for (meshIndex = 0; meshIndex < slices.length; meshIndex++) {
                     sliceEntry = slices[meshIndex];
                     if (!sliceEntry) continue;