diff --git a/release.md b/release.md
index b3e32084..ca81f97f 100644
--- a/release.md
+++ b/release.md
@@ -7,6 +7,8 @@ Full docs @ https://docs.grid.space/projects/kiri-moto
 
 * more graceful handling of security contexts blocking SharedArrayBuffer
 * FDM refactor the 'detect' support feature for auto-placing manual supports
+* FDM fix supports in belt mode
+* CAM fix surface / trace selection copy on hover/pop/new op
 * CAM decrease cutting speed when entire tool is engaged in roughing
 * CAM add dogbones support to traces ops
 * CAM add scripted contour filtering (to be extended to other ops)
@@ -17,10 +19,8 @@ Full docs @ https://docs.grid.space/projects/kiri-moto
 * CAM add rough all stock to aid lathe mode
 * CAM stock is now always on, whether offset or absolute
 * CAM add lathe worker parallelization (2x - 6x speedup)
-- add "common" overrides in ops (z top/bottom/thru, direction)
+* CAM fix pocket/trace selection with flip op
 - fix lathe yellow path in normal (not dark) mode
-- fix pocket/trace selection with flip op
-- fix supports in belt mode
 
 
 # Release 3.8 (2023-01-21)
diff --git a/src/kiri-mode/cam/client.js b/src/kiri-mode/cam/client.js
index f92dfe4e..63a3afef 100644
--- a/src/kiri-mode/cam/client.js
+++ b/src/kiri-mode/cam/client.js
@@ -343,6 +343,8 @@ CAM.init = function(kiri, api) {
     };
 
     func.opAddPocket = () => {
+        func.traceDone();
+        func.surfaceDone();
         let rec = popOp.pocket.new();
         rec.surfaces = { /* widget.id: [ faces... ] */ };
         func.opAdd(rec);
@@ -527,6 +529,9 @@ CAM.init = function(kiri, api) {
                 popped = false;
             };
             function onEnter(ev) {
+                if ((surfaceOn || traceOn) && poppedRec != rec) {
+                    return;
+                }
                 if (popped && poppedRec != rec) {
                     func.surfaceDone();
                     func.traceDone();
diff --git a/src/kiri-mode/cam/prepare.js b/src/kiri-mode/cam/prepare.js
index ef1b3a6e..8448bcd1 100644
--- a/src/kiri-mode/cam/prepare.js
+++ b/src/kiri-mode/cam/prepare.js
@@ -400,6 +400,7 @@ function prepEach(widget, settings, print, firstPoint, update) {
             if (synthPlunge && threshold && modifier && deltaXY > tolerance) {
                 // use modifier to speed up long XY move plunge rates
                 rate = Math.round(plungeRate + ((feedRate - plungeRate) * modifier));
+                cut = 1;
             } else {
                 rate = Math.min(feedRate, plungeRate);
             }