diff --git a/nodes/core/core/58-debug.html b/nodes/core/core/58-debug.html
index ebdf03ac1..04aa50789 100644
--- a/nodes/core/core/58-debug.html
+++ b/nodes/core/core/58-debug.html
@@ -151,7 +151,7 @@
                 var name = (o.name?o.name:o.id).toString().replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");
                 var topic = (o.topic||"").toString().replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");
                 var payload = (o.msg||"").toString().replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;");
-                msg.className = 'debug-message'+(o.level?(' debug-message-level-'+o.level):'')
+                msg.className = 'debug-message'+(o.level?(' debug-message-level-'+o.level):'');
                 msg.innerHTML = '<span class="debug-message-date">'+getTimestamp()+'</span>'+
                                 '<span class="debug-message-name">['+name+']</span>'+
                                 (o.topic?'<span class="debug-message-topic">'+topic+'</span>':'')+
diff --git a/public/red/main.js b/public/red/main.js
index c822c6e04..a47e99589 100644
--- a/public/red/main.js
+++ b/public/red/main.js
@@ -153,6 +153,7 @@ var RED = (function() {
             headers: {
                 "Accept":"application/json"
             },
+            cache: false,
             url: 'nodes',
             success: function(data) {
                 RED.nodes.setNodeList(data);
@@ -166,6 +167,7 @@ var RED = (function() {
             headers: {
                 "Accept":"text/html"
             },
+            cache: false,
             url: 'nodes',
             success: function(data) {
                 $("body").append(data);
@@ -178,75 +180,82 @@ var RED = (function() {
     }
 
     function loadFlows() {
-        $.getJSON("flows",function(nodes) {
-            RED.nodes.import(nodes);
-            RED.view.dirty(false);
-            RED.view.redraw();
-            RED.comms.subscribe("status/#",function(topic,msg) {
-                var parts = topic.split("/");
-                var node = RED.nodes.node(parts[1]);
-                if (node) {
-                    node.status = msg;
-                    if (statusEnabled) {
-                        node.dirty = true;
-                        RED.view.redraw();
-                    }
-                }
-            });
-            RED.comms.subscribe("node/#",function(topic,msg) {
-                var i,m;
-                var typeList;
-                var info;
-                
-                if (topic == "node/added") {
-                    var addedTypes = [];
-                    for (i=0;i<msg.length;i++) {
-                        m = msg[i];
-                        var id = m.id;
-                        RED.nodes.addNodeSet(m);
-                        if (m.loaded) {
-                            addedTypes = addedTypes.concat(m.types);
-                            $.get('nodes/'+id, function(data) {
-                                $("body").append(data);
-                            });
+        $.ajax({
+            headers: {
+                "Accept":"application/json"
+            },
+            cache: false,
+            url: 'flows',
+            success: function(nodes) {
+                RED.nodes.import(nodes);
+                RED.view.dirty(false);
+                RED.view.redraw();
+                RED.comms.subscribe("status/#",function(topic,msg) {
+                    var parts = topic.split("/");
+                    var node = RED.nodes.node(parts[1]);
+                    if (node) {
+                        node.status = msg;
+                        if (statusEnabled) {
+                            node.dirty = true;
+                            RED.view.redraw();
                         }
                     }
-                    if (addedTypes.length) {
-                        typeList = "<ul><li>"+addedTypes.join("</li><li>")+"</li></ul>";
-                        RED.notify("Node"+(addedTypes.length!=1 ? "s":"")+" added to palette:"+typeList,"success");
-                    }
-                } else if (topic == "node/removed") {
-                    for (i=0;i<msg.length;i++) {
-                        m = msg[i];
-                        info = RED.nodes.removeNodeSet(m.id);
-                        if (info.added) {
-                            typeList = "<ul><li>"+m.types.join("</li><li>")+"</li></ul>";
-                            RED.notify("Node"+(m.types.length!=1 ? "s":"")+" removed from palette:"+typeList,"success");
+                });
+                RED.comms.subscribe("node/#",function(topic,msg) {
+                    var i,m;
+                    var typeList;
+                    var info;
+                    
+                    if (topic == "node/added") {
+                        var addedTypes = [];
+                        for (i=0;i<msg.length;i++) {
+                            m = msg[i];
+                            var id = m.id;
+                            RED.nodes.addNodeSet(m);
+                            if (m.loaded) {
+                                addedTypes = addedTypes.concat(m.types);
+                                $.get('nodes/'+id, function(data) {
+                                    $("body").append(data);
+                                });
+                            }
                         }
-                    }
-                } else if (topic == "node/enabled") {
-                    if (msg.types) {
-                        info = RED.nodes.getNodeSet(msg.id);
-                        if (info.added) {
-                            RED.nodes.enableNodeSet(msg.id);
-                            typeList = "<ul><li>"+msg.types.join("</li><li>")+"</li></ul>";
-                            RED.notify("Node"+(msg.types.length!=1 ? "s":"")+" enabled:"+typeList,"success");
-                        } else {
-                            $.get('nodes/'+msg.id, function(data) {
-                                $("body").append(data);
+                        if (addedTypes.length) {
+                            typeList = "<ul><li>"+addedTypes.join("</li><li>")+"</li></ul>";
+                            RED.notify("Node"+(addedTypes.length!=1 ? "s":"")+" added to palette:"+typeList,"success");
+                        }
+                    } else if (topic == "node/removed") {
+                        for (i=0;i<msg.length;i++) {
+                            m = msg[i];
+                            info = RED.nodes.removeNodeSet(m.id);
+                            if (info.added) {
+                                typeList = "<ul><li>"+m.types.join("</li><li>")+"</li></ul>";
+                                RED.notify("Node"+(m.types.length!=1 ? "s":"")+" removed from palette:"+typeList,"success");
+                            }
+                        }
+                    } else if (topic == "node/enabled") {
+                        if (msg.types) {
+                            info = RED.nodes.getNodeSet(msg.id);
+                            if (info.added) {
+                                RED.nodes.enableNodeSet(msg.id);
                                 typeList = "<ul><li>"+msg.types.join("</li><li>")+"</li></ul>";
-                                RED.notify("Node"+(msg.types.length!=1 ? "s":"")+" added to palette:"+typeList,"success");
-                            });
-                        } 
+                                RED.notify("Node"+(msg.types.length!=1 ? "s":"")+" enabled:"+typeList,"success");
+                            } else {
+                                $.get('nodes/'+msg.id, function(data) {
+                                    $("body").append(data);
+                                    typeList = "<ul><li>"+msg.types.join("</li><li>")+"</li></ul>";
+                                    RED.notify("Node"+(msg.types.length!=1 ? "s":"")+" added to palette:"+typeList,"success");
+                                });
+                            } 
+                        }
+                    } else if (topic == "node/disabled") {
+                        if (msg.types) {
+                            RED.nodes.disableNodeSet(msg.id);
+                            typeList = "<ul><li>"+msg.types.join("</li><li>")+"</li></ul>";
+                            RED.notify("Node"+(msg.types.length!=1 ? "s":"")+" disabled:"+typeList,"success");
+                        }
                     }
-                } else if (topic == "node/disabled") {
-                    if (msg.types) {
-                        RED.nodes.disableNodeSet(msg.id);
-                        typeList = "<ul><li>"+msg.types.join("</li><li>")+"</li></ul>";
-                        RED.notify("Node"+(msg.types.length!=1 ? "s":"")+" disabled:"+typeList,"success");
-                    }
-                }
-            });
+                });
+            }
         });
     }
 
diff --git a/public/red/nodes.js b/public/red/nodes.js
index 087e3cafc..dc0827a62 100644
--- a/public/red/nodes.js
+++ b/public/red/nodes.js
@@ -108,7 +108,7 @@ RED.nodes = (function() {
             getNodeType: function(nt) {
                 return nodeDefinitions[nt];
             }
-        }
+        };
         return exports;
     })();
     
@@ -128,7 +128,7 @@ RED.nodes = (function() {
                 if (n._def.defaults.hasOwnProperty(d)) {
                     var property = n._def.defaults[d];
                     if (property.type) {
-                        var type = registry.getNodeType(property.type)
+                        var type = registry.getNodeType(property.type);
                         if (type && type.category == "config") {
                             var configNode = configNodes[n[d]];
                             if (configNode) {
@@ -181,7 +181,7 @@ RED.nodes = (function() {
                 if (node._def.defaults.hasOwnProperty(d)) {
                     var property = node._def.defaults[d];
                     if (property.type) {
-                        var type = registry.getNodeType(property.type)
+                        var type = registry.getNodeType(property.type);
                         if (type && type.category == "config") {
                             var configNode = configNodes[node[d]];
                             if (configNode) {