diff --git a/modules/path/formats/g-code b/modules/path/formats/g-code
index 32e2adc6276d81ed2e015af0727eb69a90ee93ad..545766a40028bd583cfd1ec142e395c765c776b3 100644
--- a/modules/path/formats/g-code
+++ b/modules/path/formats/g-code
@@ -40,7 +40,7 @@ var init = function() {
    mod.cutspeed.value = '2.5'
    mod.plungespeed.value = '2.5'
    mod.jogheight.value = '2'
-   mod.spindlespeed.value = '11000'
+   mod.spindlespeed.value = '10000'
    mod.tool.value = '1'
    mod.coolantoff.checked = true
    mod.formatMm.checked = true
@@ -231,7 +231,7 @@ function make_path() {
       str += "M08\n" // coolant on
    str += "G00Z"+jog_height.toFixed(4)+"\n" // move up before starting spindle
    str += "M03\n" // spindle on clockwise
-   str += "G04 P1\n" // give spindle 1 second to spin up
+   //str += "G04 P1000\n" // give spindle 1 second to spin up // some interpreters have trouble with this
    //
    // follow segments
    //
@@ -262,7 +262,8 @@ function make_path() {
    //
    // finish
    //
-   str += "G00Z"+jog_height.toFixed(4)+"\n" // move up before stopping spindle
+   str += "G00Z"+jog_height.toFixed(4)+"\n" // move up
+   str += "G00X0.0000Y0.0000"+"Z"+jog_height.toFixed(4)+"\n" // finish at origin
    str += "M05\n" // spindle stop
    if (mod.coolanton.checked)
       str += "M09\n" // coolant off