diff --git a/lib/commands/admin-rpc.js b/lib/commands/admin-rpc.js
index ed1d5b8a4..db2413518 100644
--- a/lib/commands/admin-rpc.js
+++ b/lib/commands/admin-rpc.js
@@ -50,6 +50,7 @@ var getCacheStats = function (env, server, cb) {
         metaSize: metaSize,
         channel: channelCount,
         channelSize: channelSize,
+        memoryUsage: process.memoryUsage(),
     });
 };
 
diff --git a/lib/historyKeeper.js b/lib/historyKeeper.js
index 2b5ec8770..46efcc436 100644
--- a/lib/historyKeeper.js
+++ b/lib/historyKeeper.js
@@ -99,7 +99,7 @@ module.exports.create = function (config, cb) {
     paths.staging = keyOrDefaultString('blobStagingPath', './blobstage');
     paths.blob = keyOrDefaultString('blobPath', './blob');
 
-    Env.defaultStorageLimit = typeof(config.defaultStorageLimit) === 'number' && config.defaultStorageLimit > 0?
+    Env.defaultStorageLimit = typeof(config.defaultStorageLimit) === 'number' && config.defaultStorageLimit >= 0?
         config.defaultStorageLimit:
         Core.DEFAULT_LIMIT;
 
diff --git a/www/common/diffMarked.js b/www/common/diffMarked.js
index 45d426124..8fc8aab6e 100644
--- a/www/common/diffMarked.js
+++ b/www/common/diffMarked.js
@@ -23,8 +23,17 @@ define([
         init: function () {}
     };
 
+    var mermaidThemeCSS = ".node rect { fill: #DDD; stroke: #AAA; } " +
+        "rect.task, rect.task0, rect.task2 { stroke-width: 1 !important; rx: 0 !important; } " +
+        "g.grid g.tick line { opacity: 0.25; }" +
+        "g.today line { stroke: red; stroke-width: 1; stroke-dasharray: 3; opacity: 0.5; }";
+
     require(['mermaid', 'css!/code/mermaid-new.css'], function (_Mermaid) {
         Mermaid = _Mermaid;
+        Mermaid.initialize({
+            gantt: { axisFormat: '%m-%d', },
+            "themeCSS": mermaidThemeCSS,
+        });
     });
 
     var highlighter = function () {
@@ -351,6 +360,12 @@ define([
             // retrieve the attached source code which it was drawn
             var src = el.getAttribute('mermaid-source');
 
+/*  The new source might have syntax errors that will prevent rendering.
+    It might be preferable to keep the existing state instead of removing it
+    if you don't have something better to display. Ideally we should display
+    the cause of the syntax error so that the user knows what to correct.  */
+            //if (!Mermaid.parse(src)) { } // TODO
+
             // check if that source exists in the set of charts which are about to be rendered
             if (mermaid_source.indexOf(src) === -1) {
                 // if it's not, then you can remove it