diff --git a/nodes/core/58-debug.html b/nodes/core/58-debug.html
index fd96fbc7e..7f188208a 100644
--- a/nodes/core/58-debug.html
+++ b/nodes/core/58-debug.html
@@ -16,18 +16,20 @@
 
 <script type="text/x-red" data-template-name="debug">
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
-        <input type="text" id="node-input-name" placeholder="Name">
+        <label for="node-input-complete"><i class="icon-list"></i> Output</label>
+        <select type="text" id="node-input-complete" style="display: inline-block; width: auto; vertical-align: top;">
+            <option value=false>Payload only</option>
+            <option value=true>Complete msg object</option>
+        </select>
     </div>
     <div class="form-row">
-        <label>&nbsp;</label>
-        <input type="checkbox" id="node-input-complete" placeholder="Complete" style="display: inline-block; width: auto; vertical-align: top;">
-        <label for="node-input-complete" style="width: 70%;">Show complete msg object ?</label>
+        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <input type="text" id="node-input-name" placeholder="Name">
     </div>
 </script>
 
 <script type="text/x-red" data-help-name="debug">
-	<p>The Debug node can be connected to the output of any node. It will display the timestamp, <b>msg.topic</b> and <b>msg.payload</b> fields of any messages it receives in the debug tab of the sidebar. 
+	<p>The Debug node can be connected to the output of any node. It will display the timestamp, <b>msg.topic</b> and <b>msg.payload</b> fields of any messages it receives in the debug tab of the sidebar.
 	<br/>The sidebar can be accessed under the options drop-down in the top right corner.</p>
 	<p>The button to the right of the node will toggle it's output on and off so you can de-clutter the debug window.</p>
 	<p>If the payload is an object it will be stringified first for display and indicate that by saying "(Object) ".</p>
diff --git a/nodes/core/58-debug.js b/nodes/core/58-debug.js
index 7232414d8..f42543309 100644
--- a/nodes/core/58-debug.js
+++ b/nodes/core/58-debug.js
@@ -19,22 +19,25 @@ var RED = require("../../red/red");
 var util = require("util");
 var ws = require('ws');
 var events = require("events");
-var debuglength = RED.settings.debugMaxLength||512;
+var debuglength = RED.settings.debugMaxLength||1000;
 
 function DebugNode(n) {
 	RED.nodes.createNode(this,n);
 	this.name = n.name;
 	this.complete = n.complete;
 	this.active = (n.active == null)||n.active;
+
 	this.on("input",function(msg) {
 		if (this.active) {
 			if (msg.payload instanceof Buffer) {
 				msg.payload = "(Buffer) "+msg.payload.toString();
 			}
-			if (this.complete) {
+			if (this.complete == "true") {
 				DebugNode.send({id:this.id,name:this.name,topic:msg.topic,msg:msg,_path:msg._path});
 			} else {
-				DebugNode.send({id:this.id,name:this.name,topic:msg.topic,msg:msg.payload,_path:msg._path});
+				if (typeof msg.payload !== "undefined") {
+					DebugNode.send({id:this.id,name:this.name,topic:msg.topic,msg:msg.payload,_path:msg._path});
+				}
 			}
 		}
 	});
@@ -47,30 +50,21 @@ DebugNode.send = function(msg) {
 		msg.msg = msg.msg.toString();
 	}
 	else if (typeof msg.msg === 'object') {
-		try {
-			msg.msg = "(Object) "+JSON.stringify(msg.msg,null,1);
-		}
-		catch (err) {
-			// DCJ - either can just report the circularity...
-			//msg.msg = "[Error] Can't stringify object with circular reference - see console log.";
-			// or dump out bits we can... (but things like http are mahoosive objects)
-			var seen = [];
-			msg.msg = "(Circular Object) " + JSON.stringify(msg.msg, function(key, value) {
-				if (typeof value === 'object' && value !== null) {
-					if (seen.indexOf(value) !== -1) { return; }
-					seen.push(value);
-				}
-				return value;
-			});
-			seen = null;
-		}
+		var seen = [];
+		msg.msg = "(Object) " + JSON.stringify(msg.msg, function(key, value) {
+			if (typeof value === 'object' && value !== null) {
+				if (seen.indexOf(value) !== -1) { return "[circular]"; }
+				seen.push(value);
+			}
+			return value;
+		}," ");
+		seen = null;
 	}
-
 	else if (typeof msg.msg === "boolean") msg.msg = "(boolean) "+msg.msg.toString();
 	else if (msg.msg === 0) msg.msg = "0";
 
 	if (msg.msg.length > debuglength) {
-		msg.msg = msg.msg.substr(0,debuglength) +" ...(more)";
+		msg.msg = msg.msg.substr(0,debuglength) +" ....";
 	}
 
 	for (var i in DebugNode.activeConnections) {
diff --git a/settings.js b/settings.js
index 391fbf9c7..e3e76d4a3 100644
--- a/settings.js
+++ b/settings.js
@@ -17,7 +17,7 @@ module.exports = {
     uiPort: 1880,
     mqttReconnectTime: 15000,
     serialReconnectTime: 15000,
-    debugMaxLength: 500,
+    debugMaxLength: 1000,
 
     // You can protect the user interface with a userid and password by using the following property
     // the password must be an md5 hash  eg.. 5f4dcc3b5aa765d61d8327deb882cf99 ('password')