fix corner cases to be able to do strip collects
Add additional metadata to CNC output