diff --git a/nodes/core/analysis/72-sentiment.js b/nodes/core/analysis/72-sentiment.js
index 16a4d7ea2..747e079cc 100644
--- a/nodes/core/analysis/72-sentiment.js
+++ b/nodes/core/analysis/72-sentiment.js
@@ -15,12 +15,13 @@
  **/
 
 module.exports = function(RED) {
+    "use strict";
     var sentiment = require('sentiment');
-    
+
     function SentimentNode(n) {
         RED.nodes.createNode(this,n);
         var node = this;
-    
+
         this.on("input", function(msg) {
             sentiment(msg.payload, msg.overrides || null, function (err, result) {
                 msg.sentiment = result;
diff --git a/nodes/core/core/80-template.js b/nodes/core/core/80-template.js
index aafb893e4..82348326e 100644
--- a/nodes/core/core/80-template.js
+++ b/nodes/core/core/80-template.js
@@ -15,6 +15,7 @@
  **/
 
 module.exports = function(RED) {
+    "use strict";
     var mustache = require("mustache");
     var util = require("util");
     var fs = require('fs');
diff --git a/nodes/core/core/90-comment.js b/nodes/core/core/90-comment.js
index 759b16207..ef5f08005 100644
--- a/nodes/core/core/90-comment.js
+++ b/nodes/core/core/90-comment.js
@@ -15,6 +15,7 @@
  **/
 
 module.exports = function(RED) {
+    "use strict";
     function CommentNode(n) {
         RED.nodes.createNode(this,n);
     }
diff --git a/nodes/core/core/98-unknown.js b/nodes/core/core/98-unknown.js
index 1a7362263..ed4716b86 100644
--- a/nodes/core/core/98-unknown.js
+++ b/nodes/core/core/98-unknown.js
@@ -15,6 +15,7 @@
  **/
 
 module.exports = function(RED) {
+    "use strict";
     function UnknownNode(n) {
         RED.nodes.createNode(this,n);
     }
diff --git a/nodes/core/hardware/36-rpi-gpio.js b/nodes/core/hardware/36-rpi-gpio.js
index d7378c870..99e36da53 100644
--- a/nodes/core/hardware/36-rpi-gpio.js
+++ b/nodes/core/hardware/36-rpi-gpio.js
@@ -15,6 +15,7 @@
  **/
 
 module.exports = function(RED) {
+    "use strict";
     var util = require("util");
     var exec = require('child_process').exec;
     var fs =  require('fs');
diff --git a/nodes/core/io/10-mqtt.html b/nodes/core/io/10-mqtt.html
index e4d6c985d..3ad7f3239 100644
--- a/nodes/core/io/10-mqtt.html
+++ b/nodes/core/io/10-mqtt.html
@@ -102,7 +102,7 @@
 <script type="text/x-red" data-template-name="mqtt-broker">
     <div class="form-row node-input-broker">
         <label for="node-config-input-broker"><i class="icon-bookmark"></i> Broker</label>
-        <input class="input-append-left" type="text" id="node-config-input-broker" placeholder="Broker" style="width: 40%;" >
+        <input class="input-append-left" type="text" id="node-config-input-broker" placeholder="localhost" style="width: 40%;" >
         <label for="node-config-input-port" style="margin-left: 10px; width: 35px; "> Port</label>
         <input type="text" id="node-config-input-port" placeholder="Port" style="width:45px">
     </div>
@@ -124,7 +124,7 @@
     RED.nodes.registerType('mqtt-broker',{
         category: 'config',
         defaults: {
-            broker: {value:"localhost",required:true},
+            broker: {value:"",required:true},
             port: {value:1883,required:true,validate:RED.validators.number()},
             clientid: { value:"" }
             //user -> credentials
@@ -132,6 +132,7 @@
 
         },
         label: function() {
+            if (this.broker == "") { this.broker = "localhost"; }
             return (this.clientid?this.clientid+"@":"")+this.broker+":"+this.port;
         },
         oneditprepare: function() {
@@ -144,10 +145,10 @@
                 } else {
                     $('#node-config-input-pass').val('');
                 }
-
             });
         },
         oneditsave: function() {
+            if (this.broker == "") { this.broker = "localhost"; }
             var newUser = $('#node-config-input-user').val();
             var newPass = $('#node-config-input-pass').val();
             var credentials = {};
diff --git a/nodes/core/io/22-websocket.js b/nodes/core/io/22-websocket.js
index 68dded820..bcdf5f0fd 100644
--- a/nodes/core/io/22-websocket.js
+++ b/nodes/core/io/22-websocket.js
@@ -15,51 +15,51 @@
  **/
 
 module.exports = function(RED) {
-    
+    "use strict";
     var ws = require("ws"),
         inspect = require("sys").inspect;
-    
+
     // A node red node that sets up a local websocket server
     function WebSocketListenerNode(n) {
         // Create a RED node
         RED.nodes.createNode(this,n);
-    
+
         var node = this;
-    
+
         // Store local copies of the node configuration (as defined in the .html)
         node.path = n.path;
         node.wholemsg = (n.wholemsg === "true");
-        
+
         node._inputNodes = [];    // collection of nodes that want to receive events
-    
+
         var path = RED.settings.httpNodeRoot || "/";
         path = path + (path.slice(-1) == "/" ? "":"/") + (node.path.charAt(0) == "/" ? node.path.substring(1) : node.path);
-    
+
         // Workaround https://github.com/einaros/ws/pull/253
         // Listen for 'newListener' events from RED.server
         node._serverListeners = {};
-    
+
         var storeListener = function(/*String*/event,/*function*/listener){
             if(event == "error" || event == "upgrade" || event == "listening"){
                 node._serverListeners[event] = listener;
             }
         }
-    
+
         node._clients = {};
-        
+
         RED.server.addListener('newListener',storeListener);
-    
+
         // Create a WebSocket Server
         node.server = new ws.Server({server:RED.server,path:path});
-    
+
         // Workaround https://github.com/einaros/ws/pull/253
         // Stop listening for new listener events
         RED.server.removeListener('newListener',storeListener);
-    
+
         node.server.on('connection', function(socket){
             var id = (1+Math.random()*4294967295).toString(16);
             node._clients[id] = socket;
-            
+
             socket.on('close',function() {
                 delete node._clients[id];
             });
@@ -70,7 +70,7 @@ module.exports = function(RED) {
                 node.warn("An error occured on the ws connection: "+inspect(err));
             });
         });
-    
+
         node.on("close", function() {
             // Workaround https://github.com/einaros/ws/pull/253
             // Remove listeners from RED.server
@@ -82,17 +82,17 @@ module.exports = function(RED) {
                 }
             }
             node._serverListeners = {};
-    
+
             node.server.close();
             node._inputNodes = [];
         });
     }
     RED.nodes.registerType("websocket-listener",WebSocketListenerNode);
-    
+
     WebSocketListenerNode.prototype.registerInputNode = function(/*Node*/handler){
         this._inputNodes.push(handler);
     }
-    
+
     WebSocketListenerNode.prototype.handleEvent = function(id,/*socket*/socket,/*String*/event,/*Object*/data,/*Object*/flags){
         var msg;
         if (this.wholemsg) {
@@ -103,25 +103,25 @@ module.exports = function(RED) {
             };
         }
         msg._session = {type:"websocket",id:id};
-        
+
         for (var i = 0; i < this._inputNodes.length; i++) {
             this._inputNodes[i].send(msg);
         };
     }
-    
+
     WebSocketListenerNode.prototype.broadcast = function(data){
         for(var i in this.server.clients){
             this.server.clients[i].send(data);
         };
     }
-    
+
     WebSocketListenerNode.prototype.send = function(id,data){
         var session = this._clients[id];
         if (session) {
             session.send(data);
         }
     }
-    
+
     function WebSocketInNode(n) {
         RED.nodes.createNode(this,n);
         this.server = n.server;
@@ -134,7 +134,7 @@ module.exports = function(RED) {
         }
     }
     RED.nodes.registerType("websocket in",WebSocketInNode);
-    
+
     function WebSocketOutNode(n) {
         RED.nodes.createNode(this,n);
         var node = this;
diff --git a/nodes/core/io/23-watch.js b/nodes/core/io/23-watch.js
index 3c234f4ef..fd9819538 100644
--- a/nodes/core/io/23-watch.js
+++ b/nodes/core/io/23-watch.js
@@ -15,13 +15,14 @@
  **/
 
 module.exports = function(RED) {
+    "use strict";
     var notify = require("fs.notify");
     var fs = require("fs");
     var sep = require("path").sep;
-    
+
     function WatchNode(n) {
         RED.nodes.createNode(this,n);
-    
+
         this.files = n.files.split(",");
         for (var f in this.files) {
             this.files[f] = this.files[f].trim();
@@ -34,7 +35,7 @@ module.exports = function(RED) {
             var msg = { payload: path, topic: node.p, file: file};
             node.send(msg);
         });
-    
+
         this.close = function() {
             notifications.close();
         }
diff --git a/nodes/core/io/32-udp.js b/nodes/core/io/32-udp.js
index 12ce92a36..ed2dc9db1 100644
--- a/nodes/core/io/32-udp.js
+++ b/nodes/core/io/32-udp.js
@@ -15,8 +15,9 @@
  **/
 
 module.exports = function(RED) {
+    "use strict";
     var dgram = require('dgram');
-    
+
     // The Input Node
     function UDPin(n) {
         RED.nodes.createNode(this,n);
@@ -26,18 +27,18 @@ module.exports = function(RED) {
         this.iface = n.iface || null;
         this.multicast = n.multicast;
         var node = this;
-    
+
         var server = dgram.createSocket('udp4');
-    
+
         server.on("error", function (err) {
             if ((err.code == "EACCES") && (node.port < 1024)) {
                 node.error("UDP access error, you may need root access for ports below 1024");
-            } else { 
+            } else {
                 node.error("UDP error : "+err.code);
             }
             server.close();
         });
-    
+
         server.on('message', function (message, remote) {
             var msg;
             if (node.datatype =="base64") {
@@ -49,7 +50,7 @@ module.exports = function(RED) {
             }
             node.send(msg);
         });
-    
+
         server.on('listening', function () {
             var address = server.address();
             node.log('udp listener at ' + address.address + ":" + address.port);
@@ -60,7 +61,7 @@ module.exports = function(RED) {
                     server.addMembership(node.group,node.iface);
                     node.log("udp multicast group "+node.group);
                 } catch (e) {
-                    if (e.errno == "EINVAL") { 
+                    if (e.errno == "EINVAL") {
                         node.error("Bad Multicast Address");
                     } else if (e.errno == "ENODEV") {
                         node.error("Must be ip address of the required interface");
@@ -70,7 +71,7 @@ module.exports = function(RED) {
                 }
             }
         });
-    
+
         node.on("close", function() {
             try {
                 server.close();
@@ -79,12 +80,12 @@ module.exports = function(RED) {
                 node.error(err);
             }
         });
-    
+
         server.bind(node.port,node.iface);
     }
     RED.nodes.registerType("udp in",UDPin);
-    
-    
+
+
     // The Output Node
     function UDPout(n) {
         RED.nodes.createNode(this,n);
@@ -96,9 +97,9 @@ module.exports = function(RED) {
         this.iface = n.iface || null;
         this.multicast = n.multicast;
         var node = this;
-    
+
         var sock = dgram.createSocket('udp4');  // only use ipv4 for now
-    
+
         if (node.multicast != "false") {
             if (node.outport == "") { node.outport = node.port; }
             sock.bind(node.outport, function() {    // have to bind before you can enable broadcast...
@@ -127,7 +128,7 @@ module.exports = function(RED) {
         } else {
             node.log('udp ready : '+node.addr+":"+node.port);
         }
-    
+
         node.on("input", function(msg) {
             if (msg.payload != null) {
                 var add = node.addr || msg.ip || "";
@@ -155,7 +156,7 @@ module.exports = function(RED) {
                 }
             }
         });
-    
+
         node.on("close", function() {
             try {
                 sock.close();
diff --git a/nodes/core/logic/10-switch.js b/nodes/core/logic/10-switch.js
index e607281de..237c83c39 100644
--- a/nodes/core/logic/10-switch.js
+++ b/nodes/core/logic/10-switch.js
@@ -15,6 +15,7 @@
  **/
 
 module.exports = function(RED) {
+    "use strict";
     var operators = {
         'eq': function(a, b) { return a == b; },
         'neq': function(a, b) { return a != b; },
@@ -31,7 +32,7 @@ module.exports = function(RED) {
         'nnull': function(a) { return typeof a != "undefined"; },
         'else': function(a) { return a === true; }
     };
-    
+
     function SwitchNode(n) {
         RED.nodes.createNode(this, n);
         this.rules = n.rules;
@@ -39,7 +40,7 @@ module.exports = function(RED) {
         this.checkall = n.checkall || "true";
         var propertyParts = n.property.split("."),
             node = this;
-    
+
         for (var i=0; i<this.rules.length; i+=1) {
             var rule = this.rules[i];
             if (!isNaN(Number(rule.v))) {
@@ -47,7 +48,7 @@ module.exports = function(RED) {
                 rule.v2 = Number(rule.v2);
             }
         }
-    
+
         this.on('input', function (msg) {
             var onward = [];
             var prop = propertyParts.reduce(function (obj, i) {
diff --git a/nodes/core/logic/15-change.js b/nodes/core/logic/15-change.js
index 9549a8cb0..3669de36e 100644
--- a/nodes/core/logic/15-change.js
+++ b/nodes/core/logic/15-change.js
@@ -15,6 +15,7 @@
  **/
 
 module.exports = function(RED) {
+    "use strict";
     function ChangeNode(n) {
         RED.nodes.createNode(this, n);
         this.action = n.action;
@@ -34,7 +35,7 @@ module.exports = function(RED) {
             if (lastPart) { stem = stem[lastPart] = value; }
             return stem;
         };
-    
+
         this.on('input', function (msg) {
             if (node.action == "change") {
                 try {
diff --git a/nodes/core/logic/16-range.js b/nodes/core/logic/16-range.js
index 50e1be1a4..ec39342ae 100644
--- a/nodes/core/logic/16-range.js
+++ b/nodes/core/logic/16-range.js
@@ -15,6 +15,7 @@
  **/
 
 module.exports = function(RED) {
+    "use strict";
     function RangeNode(n) {
         RED.nodes.createNode(this, n);
         this.action = n.action;
@@ -24,7 +25,7 @@ module.exports = function(RED) {
         this.minout = Number(n.minout);
         this.maxout = Number(n.maxout);
         var node = this;
-    
+
         this.on('input', function (msg) {
             var n = Number(msg.payload);
             if (!isNaN(n)) {
diff --git a/nodes/core/parsers/70-CSV.js b/nodes/core/parsers/70-CSV.js
index 83b47b223..24b7295ff 100644
--- a/nodes/core/parsers/70-CSV.js
+++ b/nodes/core/parsers/70-CSV.js
@@ -15,6 +15,7 @@
  **/
 
 module.exports = function(RED) {
+    "use strict";
     function CSVNode(n) {
         RED.nodes.createNode(this,n);
         this.template = n.temp.split(",");
diff --git a/nodes/core/parsers/70-JSON.js b/nodes/core/parsers/70-JSON.js
index 67b4e6e21..e216bd4fb 100644
--- a/nodes/core/parsers/70-JSON.js
+++ b/nodes/core/parsers/70-JSON.js
@@ -15,8 +15,9 @@
  **/
 
 module.exports = function(RED) {
+    "use strict";
     var util = require("util");
-    
+
     function JSONNode(n) {
         RED.nodes.createNode(this,n);
         var node = this;
diff --git a/nodes/core/parsers/70-XML.js b/nodes/core/parsers/70-XML.js
index e93398260..c30b0e933 100644
--- a/nodes/core/parsers/70-XML.js
+++ b/nodes/core/parsers/70-XML.js
@@ -15,10 +15,11 @@
  **/
 
 module.exports = function(RED) {
+    "use strict";
     var xml2js = require('xml2js');
     var parseString = xml2js.parseString;
     var builder = new xml2js.Builder({renderOpts:{pretty:false}});
-    
+
     function XMLNode(n) {
         RED.nodes.createNode(this,n);
         var node = this;
diff --git a/nodes/core/social/32-feedparse.js b/nodes/core/social/32-feedparse.js
index ad5e4995b..97630e7d4 100644
--- a/nodes/core/social/32-feedparse.js
+++ b/nodes/core/social/32-feedparse.js
@@ -15,9 +15,10 @@
  **/
 
 module.exports = function(RED) {
+    "use strict";
     var FeedParser = require("feedparser");
     var request = require("request");
-    
+
     function FeedParseNode(n) {
         RED.nodes.createNode(this,n);
         this.url = n.url;
@@ -54,18 +55,17 @@ module.exports = function(RED) {
             };
             this.interval_id = setInterval(getFeed,node.interval);
             getFeed();
-    
+
         } else {
             this.error("Invalid url");
         }
     }
-    
+
     RED.nodes.registerType("feedparse",FeedParseNode);
-    
+
     FeedParseNode.prototype.close = function() {
         if (this.interval_id != null) {
             clearInterval(this.interval_id);
         }
     }
-}    
-
+}
diff --git a/nodes/core/social/61-email.js b/nodes/core/social/61-email.js
index 40ee56375..3ffd886e4 100644
--- a/nodes/core/social/61-email.js
+++ b/nodes/core/social/61-email.js
@@ -15,6 +15,7 @@
  **/
 
 module.exports = function(RED) {
+    "use strict";
     var util = require('util');
     var nodemailer = require("nodemailer");
     var Imap = null;
diff --git a/nodes/core/social/91-irc.js b/nodes/core/social/91-irc.js
index 1c4581d2e..262a233bf 100644
--- a/nodes/core/social/91-irc.js
+++ b/nodes/core/social/91-irc.js
@@ -15,9 +15,10 @@
  **/
 
 module.exports = function(RED) {
+    "use strict";
     var irc = require("irc");
     var util = require("util");
-    
+
     // The Server Definition - this opens (and closes) the connection
     function IRCServerNode(n) {
         RED.nodes.createNode(this,n);
@@ -32,8 +33,8 @@ module.exports = function(RED) {
         });
     }
     RED.nodes.registerType("irc-server",IRCServerNode);
-    
-    
+
+
     // The Input Node
     function IrcInNode(n) {
         RED.nodes.createNode(this,n);
@@ -50,7 +51,7 @@ module.exports = function(RED) {
         }
         this.ircclient = this.serverConfig.ircclient;
         var node = this;
-    
+
         this.ircclient.addListener('message', function (from, to, message) {
             //util.log(from + ' => ' + to + ': ' + message);
             var msg = { "topic":from, "from":from, "to":to, "payload":message };
@@ -60,7 +61,7 @@ module.exports = function(RED) {
             var msg = { "topic":from, "from":from, "to":"PRIV", "payload":message };
             node.send([msg,null]);
         });
-    
+
         this.ircclient.addListener('join', function(channel, who) {
             var msg = { "payload": { "type":"join", "who":who, "channel":channel } };
             node.send([null,msg]);
@@ -90,11 +91,11 @@ module.exports = function(RED) {
             var msg = { "payload": { "type": "names", "channel": channel, "names": nicks} };
             node.send([null, msg]);
         });
-    
+
     }
     RED.nodes.registerType("irc in",IrcInNode);
-    
-    
+
+
     // The Output Node
     function IrcOutNode(n) {
         RED.nodes.createNode(this,n);
@@ -112,7 +113,7 @@ module.exports = function(RED) {
         }
         this.ircclient = this.serverConfig.ircclient;
         var node = this;
-    
+
         this.on("input", function(msg) {
             if (Object.prototype.toString.call( msg.raw ) === '[object Array]') {
                 var m = msg.raw;
diff --git a/nodes/core/storage/28-tail.js b/nodes/core/storage/28-tail.js
index bd30df6cf..c879943c9 100644
--- a/nodes/core/storage/28-tail.js
+++ b/nodes/core/storage/28-tail.js
@@ -15,16 +15,17 @@
  **/
 
 module.exports = function(RED) {
+    "use strict";
     var fs = require("fs");
     var spawn = require('child_process').spawn;
-    
+
     function TailNode(n) {
         RED.nodes.createNode(this,n);
-    
+
         this.filename = n.filename;
         this.split = n.split;
         var node = this;
-    
+
         var err = "";
         var tail = spawn("tail", ["-f", this.filename]);
         tail.stdout.on("data", function (data) {
@@ -43,15 +44,15 @@ module.exports = function(RED) {
                 node.send(msg);
             }
         });
-    
+
         tail.stderr.on("data", function(data) {
             node.warn(data.toString());
         });
-    
+
         this.on("close", function() {
             if (tail) tail.kill();
         });
     }
-    
+
     RED.nodes.registerType("tail",TailNode);
 }
diff --git a/nodes/core/storage/50-file.js b/nodes/core/storage/50-file.js
index 016079898..1a584c241 100644
--- a/nodes/core/storage/50-file.js
+++ b/nodes/core/storage/50-file.js
@@ -15,18 +15,19 @@
  **/
 
 module.exports = function(RED) {
+    "use strict";
     var fs = require("fs");
-    
+
     function FileNode(n) {
         RED.nodes.createNode(this,n);
-    
+
         this.filename = n.filename;
         this.appendNewline = n.appendNewline;
         this.overwriteFile = n.overwriteFile;
         var node = this;
         this.on("input",function(msg) {
             var filename = msg.filename || this.filename;
-    
+
             if (filename == "") {
                 node.warn('No filename specified');
             } else if (typeof msg.payload != "undefined") {
@@ -60,10 +61,10 @@ module.exports = function(RED) {
         });
     }
     RED.nodes.registerType("file",FileNode);
-    
+
     function FileInNode(n) {
         RED.nodes.createNode(this,n);
-    
+
         this.filename = n.filename;
         this.format = n.format;
         var node = this;
@@ -73,7 +74,7 @@ module.exports = function(RED) {
         }
         this.on("input",function(msg) {
             var filename = msg.filename || this.filename;
-    
+
             if (filename == "") {
                 node.warn('No filename specified');
             } else {
diff --git a/nodes/core/storage/66-mongodb.html b/nodes/core/storage/66-mongodb.html
index 3a2490440..04f36cd72 100644
--- a/nodes/core/storage/66-mongodb.html
+++ b/nodes/core/storage/66-mongodb.html
@@ -105,9 +105,10 @@
         <div class="form-row">
         <label for="node-input-operation"><i class="icon-wrench"></i> Operation</label>
         <select type="text" id="node-input-operation" style="display: inline-block; vertical-align: top;">
-            <option value=store>save</option>
-            <option value=insert>insert</option>
-            <option value=delete>remove</option>
+            <option value="store">save</option>
+            <option value="insert">insert</option>
+            <option value="update">update</option>
+            <option value="delete">remove</option>
         </select>
     </div>
     <div class="form-row node-input-payonly">
diff --git a/nodes/core/storage/66-mongodb.js b/nodes/core/storage/66-mongodb.js
index 50a3bbcc6..3913ec8b9 100644
--- a/nodes/core/storage/66-mongodb.js
+++ b/nodes/core/storage/66-mongodb.js
@@ -15,9 +15,10 @@
  **/
 
 module.exports = function(RED) {
+    "use strict";
     var mongo = require('mongodb');
     var MongoClient = mongo.MongoClient;
-    
+
     function MongoNode(n) {
         RED.nodes.createNode(this,n);
         this.hostname = n.hostname;
@@ -29,20 +30,20 @@ module.exports = function(RED) {
             this.username = credentials.user;
             this.password = credentials.password;
         }
-        
+
         var url = "mongodb://";
         if (this.username && this.password) {
             url += this.username+":"+this.password+"@";
         }
         url += this.hostname+":"+this.port+"/"+this.db;
-        
+
         this.url = url;
     }
-    
+
     RED.nodes.registerType("mongodb",MongoNode);
-    
+
     var querystring = require('querystring');
-    
+
     RED.httpAdmin.get('/mongodb/:id',function(req,res) {
         var credentials = RED.nodes.getCredentials(req.params.id);
         if (credentials) {
@@ -51,12 +52,12 @@ module.exports = function(RED) {
             res.send(JSON.stringify({}));
         }
     });
-    
+
     RED.httpAdmin.delete('/mongodb/:id',function(req,res) {
         RED.nodes.deleteCredentials(req.params.id);
         res.send(200);
     });
-    
+
     RED.httpAdmin.post('/mongodb/:id',function(req,res) {
         var body = "";
         req.on('data', function(chunk) {
@@ -79,8 +80,8 @@ module.exports = function(RED) {
             res.send(200);
         });
     });
-    
-    
+
+
     function MongoOutNode(n) {
         RED.nodes.createNode(this,n);
         this.collection = n.collection;
@@ -88,7 +89,7 @@ module.exports = function(RED) {
         this.payonly = n.payonly || false;
         this.operation = n.operation;
         this.mongoConfig = RED.nodes.getNode(this.mongodb);
-    
+
         if (this.mongoConfig) {
             var node = this;
             MongoClient.connect(this.mongoConfig.url, function(err,db) {
@@ -116,6 +117,15 @@ module.exports = function(RED) {
                                 coll.insert(msg,function(err,item){if (err){node.error(err);}});
                             }
                         }
+                        else if (node.operation == "update") {
+                            delete msg._topic;
+                            if (node.payonly) {
+                                if (typeof msg.payload !== "object") { msg.payload = {"payload":msg.payload}; }
+                                coll.update(msg.payload,function(err,item){ if (err){node.error(err);} });
+                            } else {
+                                coll.update(msg,function(err,item){if (err){node.error(err);}});
+                            }
+                        }
                         if (node.operation == "delete") {
                             coll.remove(msg.payload, {w:1}, function(err, items){ if (err) node.error(err); });
                         }
@@ -125,7 +135,7 @@ module.exports = function(RED) {
         } else {
             this.error("missing mongodb configuration");
         }
-    
+
         this.on("close", function() {
             if (this.clientDb) {
                 this.clientDb.close();
@@ -133,14 +143,14 @@ module.exports = function(RED) {
         });
     }
     RED.nodes.registerType("mongodb out",MongoOutNode);
-    
-    
+
+
     function MongoInNode(n) {
         RED.nodes.createNode(this,n);
         this.collection = n.collection;
         this.mongodb = n.mongodb;
         this.mongoConfig = RED.nodes.getNode(this.mongodb);
-    
+
         if (this.mongoConfig) {
             var node = this;
             MongoClient.connect(this.mongoConfig.url, function(err,db) {
@@ -168,7 +178,7 @@ module.exports = function(RED) {
         } else {
             this.error("missing mongodb configuration");
         }
-    
+
         this.on("close", function() {
             if (this.clientDb) {
                 this.clientDb.close();