diff --git a/js/cam/processes/GCodeExporter.js b/js/cam/processes/GCodeExporter.js
index 9c945d36907acc785d6f7c3c6c5f1171164a5eaf..b647442d5cdf1e83fe86b5eb88b177c5af2669e2 100644
--- a/js/cam/processes/GCodeExporter.js
+++ b/js/cam/processes/GCodeExporter.js
@@ -145,7 +145,7 @@ define(['underscore', 'cam', 'lattice', 'three'], function(_, cam, lattice, THRE
     };
 
     GCodeExporter.prototype._isMoveCommand = function(line){
-        return line.substr(0,3) == "G01" || line.substr(0,2) == "G0";
+        return line.substr(0,2) == "G1" || line.substr(0,2) == "G0" || line.substr(0,3) == "G01";
     };
 
     GCodeExporter.prototype._simulateMove = function(line, speed, machine, settings, callback){
diff --git a/js/models/SerialComm.js b/js/models/SerialComm.js
index 9bc954f77564158b254ef23ef889276ebaf925f5..a1ed3c9f2de6033b00d6450a615c5e9ad17327d3 100644
--- a/js/models/SerialComm.js
+++ b/js/models/SerialComm.js
@@ -137,17 +137,15 @@ define(['underscore', 'backbone', 'socketio', 'machineState', 'cam'],
             if (data == "" || data == '\n' || data == "\r") return;
             serialComm.set("lastMessageReceived", data, {silent:true});
             serialComm.trigger("change:lastMessageReceived");
-            console.log(data);
             try {
                 var json = JSON.parse(data);
-                console.log(json);
                 if (json.r && json.r.sr){
                     serialComm.getMachineState().setPosition(json.r.sr);
                 } else if (json.sr){
                     serialComm.getMachineState().setPosition(json.sr);
                 }
             } catch(err) {
-                console.warn(err);
+//                console.warn(err);
             }
         });
 
@@ -178,7 +176,7 @@ define(['underscore', 'backbone', 'socketio', 'machineState', 'cam'],
         });
 
         socket.on("errorMsg", function(data){
-            console.log(data);
+            console.warn(data);
             serialComm.set("error", data.error);
         });