diff --git a/src/js/macros.js b/src/js/macros.js
index 0933890..2256269 100644
--- a/src/js/macros.js
+++ b/src/js/macros.js
@@ -164,15 +164,14 @@ module.exports = {
       console.log(" this.state.selected && time: ",this.state.selected, this.state.selected_time);
       console.log("selectedValues: ",this.selectedValues[this.tab - 1]);
 
-      if (this.selectedValues[this.tab - 1] == "default") {
-        var file = this.newGcode[this.tab - 1];
-        this.uploadGCode(macrosName+'.ngc', file);
-      }
+      var file_name=this.selectedValues[this.tab - 1] == "default"?macrosName+'.ngc':this.selectedValues[this.tab - 1];
+      var file = this.newGcode[this.tab - 1];
+
+      this.uploadGCode(file_name, file);
 
       this.config.macros[this.tab - 1].name = macrosName;
       this.config.macros[this.tab - 1].color = macrosColor;
-      this.config.macros[this.tab - 1].gcode_file_name =
-        this.selectedValues[this.tab - 1]  == "default" ? macrosName+'.ngc' : this.selectedValues[this.tab - 1] ;
+      this.config.macros[this.tab - 1].gcode_file_name = file_name ;
       this.config.macros[this.tab - 1].gcode_file_time =
         this.state.selected_time;
       console.log("config.macros[this.tab - 1].gcode_file_name",this.config.macros[this.tab - 1].gcode_file_name);
diff --git a/src/py/bbctrl/FileHandler.py b/src/py/bbctrl/FileHandler.py
index e6bae6e..24085cd 100644
--- a/src/py/bbctrl/FileHandler.py
+++ b/src/py/bbctrl/FileHandler.py
@@ -51,6 +51,7 @@ class FileHandler(bbctrl.APIHandler):
             # Delete a single file
             filename = os.path.basename(filename)
             self.get_log('FileHandler').info('filename ' + filename)
+            self.get_log('FileHandler').info(' self.get_upload(filename)' + self.get_upload(filename))
             safe_remove(self.get_upload(filename))
             self.get_ctrl().preplanner.delete_plans(filename)
             self.get_ctrl().state.remove_file(filename)
@@ -85,8 +86,6 @@ class FileHandler(bbctrl.APIHandler):
         else:
             filebasename = os.path.basename(url_unescape(filename))
         
-        self.get_log('FileHandler').info(
-            'FileBaseName: ' + filebasename)
         try:
             with open(self.get_upload(filebasename).encode('utf8'), 'r') as f:
                 self.write(f.read())
diff --git a/src/py/bbctrl/Preplanner.py b/src/py/bbctrl/Preplanner.py
index 094fe9a..921007a 100644
--- a/src/py/bbctrl/Preplanner.py
+++ b/src/py/bbctrl/Preplanner.py
@@ -241,7 +241,9 @@ class Preplanner(object):
 
     def delete_all_plans(self):
         files = glob.glob(self.ctrl.get_plan('*'))
-        for path in files: safe_remove(path)
+        for path in files: 
+            self.log.info('deleting files: '+path)
+            safe_remove(path)
         self.invalidate_all()
 
 
diff --git a/src/py/bbctrl/State.py b/src/py/bbctrl/State.py
index 0b14249..2c383ff 100644
--- a/src/py/bbctrl/State.py
+++ b/src/py/bbctrl/State.py
@@ -134,6 +134,11 @@ class State(object):
 
         if len(files): self.select_file(files[0])
         else: self.select_file('') 
+    
+    def return_files(self):
+        files = copy.deepcopy(self.get('files'))
+        return files
+    
 
     def load_gcodes(self):
         GCodeList = []