diff --git a/README.md b/README.md
index 88e3cab99b4..9641ec3da91 100644
--- a/README.md
+++ b/README.md
@@ -197,7 +197,11 @@ To learn more about the Nightscout API, visit https://YOUR-SITE.com/api-docs.htm
   * `ALARM_TIMEAGO_URGENT` (`on`) - possible values `on` or `off`
   * `ALARM_TIMEAGO_URGENT_MINS` (`30`) - minutes since the last reading to trigger a urgent alarm
   * `SHOW_PLUGINS` - enabled plugins that should have their visualizations shown, defaults to all enabled
-  * `LANGUAGE` (`en`) - language of Nighscout. If not available english is used
+  * `LANGUAGE` (`en`) - language of Nightscout. If not available english is used
+  * `SCALE_Y` (`log`) - The type of scaling used for the Y axis of the charts system wide.
+    * The default `log` (logarithmic) option will let you see more detail towards the lower range, while still showing the full CGM range.
+    * The `linear` option has equidistant tick marks, the range used is dynamic so that space at the top of chart isn't wasted.
+    * The `log-dynamic` is similar to the default `log` options, but uses the same dynamic range and the `linear` scale. 
 
 ### Plugins
 
@@ -241,7 +245,8 @@ To learn more about the Nightscout API, visit https://YOUR-SITE.com/api-docs.htm
     * `CAGE_WARN` (`48`) - If time since last `Site Change` matches `CAGE_WARN`, user will be alarmed to to change the cannula
     * `CAGE_URGENT` (`72`) - If time since last `Site Change` matches `CAGE_URGENT`, user will be issued a persistent warning of overdue change.
   * `treatmentnotify` (Treatment Notifications) - Generates notifications when a treatment has been entered and snoozes alarms minutes after a treatment.  Default snooze is 10 minutes, and can be set using the `TREATMENTNOTIFY_SNOOZE_MINS` [extended setting](#extended-settings).
-  * `basal` (Basal Profile) - Adds the Basal pill visualization to display the basal rate for the current time.  Also enables the `bwp` plugin to calculate correction temp basal suggestions.  Uses the `basal` field from the [treatment profile](#treatment-profile).
+  * `basal` (Basal Profile) - Adds the Basal pill visualization to display the basal rate for the current time.  Also enables the `bwp` plugin to calculate correction temp basal suggestions.  Uses the `basal` field from the [treatment profile](#treatment-profile). Also uses the extended setting:
+    * `BASAL_RENDER` (`none`) - Possible values are `none`, `default`, or `icicle` (inverted)
   * `bridge` (Share2Nightscout bridge) - Glucose reading directly from the Share service, uses these extended settings:
     * `BRIDGE_USER_NAME` - Your user name for the Share service.
     * `BRIDGE_PASSWORD` - Your password for the Share service.
@@ -250,6 +255,14 @@ To learn more about the Nightscout API, visit https://YOUR-SITE.com/api-docs.htm
     * `BRIDGE_FIRST_FETCH_COUNT` (`3`) - Changes max count during the very first update only.
     * `BRIDGE_MAX_FAILURES` (`3`) - How many failures before giving up.
     * `BRIDGE_MINUTES` (`1400`) - The time window to search for new data per update (default is one day in minutes).
+  * `mmconnect` (MiniMed Connect bridge) - Transfer real-time MiniMed Connect data from the Medtronic CareLink server into Nightscout ([read more](https://github.com/mddub/minimed-connect-to-nightscout))
+    * `MMCONNECT_USER_NAME` - Your user name for CareLink Connect.
+    * `MMCONNECT_PASSWORD` - Your password for CareLink Connect.
+    * `MMCONNECT_INTERVAL` (`60000` *1 minute*) - Number of milliseconds to wait between requests to the CareLink server.
+    * `MMCONNECT_MAX_RETRY_DURATION` (`32`) - Maximum number of total seconds to spend retrying failed requests before giving up.
+    * `MMCONNECT_SGV_LIMIT` (`24`) - Maximum number of recent sensor glucose values to send to Nightscout on each request.
+    * `MMCONNECT_VERBOSE` - Set this to "true" to log CareLink request information to the console.
+    * `MMCONNECT_STORE_RAW_DATA` - Set this to "true" to store raw data returned from CareLink as `type: "carelink_raw"` database entries (useful for development).
   
  Also see [Pushover](#pushover) and [IFTTT Maker](#ifttt-maker).
  
diff --git a/app.js b/app.js
index fa807b81a5d..9618fde24ed 100644
--- a/app.js
+++ b/app.js
@@ -1,6 +1,7 @@
 
 var express = require('express');
 var compression = require('compression');
+var bodyParser = require('body-parser');
 function create (env, ctx) {
   ///////////////////////////////////////////////////
   // api and json object variables
@@ -17,11 +18,12 @@ function create (env, ctx) {
     // fallback to standard filter function
     return compression.filter(req, res);
   }}));
+  // app.use(bodyParser({limit: 1048576 * 50, extended: true }));
 
   //if (env.api_secret) {
   //    console.log("API_SECRET", env.api_secret);
   //}
-  app.use('/api/v1', api);
+  app.use('/api/v1', bodyParser({limit: 1048576 * 50 }), api);
 
 
   // pebble data
diff --git a/bower.json b/bower.json
index 0511964f203..57c271450a2 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "nightscout",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "dependencies": {
     "jquery": "2.1.0",
     "jQuery-Storage-API": "~1.7.2",
diff --git a/bundle/bundle.source.js b/bundle/bundle.source.js
index 0ca7d7235eb..d78ecb3c868 100644
--- a/bundle/bundle.source.js
+++ b/bundle/bundle.source.js
@@ -10,6 +10,7 @@
     , units: require('../lib/units')()
     , plugins: require('../lib/plugins/')().registerClientDefaults()
     , report_plugins: require('../lib/report_plugins/')()
+    , admin_plugins: require('../lib/admin_plugins/')()
   };
 
   console.info('Nightscout bundle ready');
diff --git a/lib/admin_plugins/cleanstatusdb.js b/lib/admin_plugins/cleanstatusdb.js
new file mode 100644
index 00000000000..86e61e987f8
--- /dev/null
+++ b/lib/admin_plugins/cleanstatusdb.js
@@ -0,0 +1,70 @@
+'use strict';
+
+var cleanstatusdb = {
+  name: 'cleanstatusdb'
+  , label: 'Clean Mongo status database'
+  , pluginType: 'admin'
+};
+
+function init() {
+  return cleanstatusdb;
+}
+
+module.exports = init;
+
+cleanstatusdb.actions = [
+    {
+        name: 'Delete all documents from devicestatus collection'
+      , description: 'This task removes all documents from devicestatus collection. Useful when uploader battery status is not properly updated.'
+      , buttonLabel: 'Delete all documents'
+      , confirmText: 'Delete all documents from devicestatus collection?'
+    }
+  ];
+
+cleanstatusdb.actions[0].init = function init(client, callback) {
+  var translate = client.translate;
+  var $status = $('#admin_' + cleanstatusdb.name + '_0_status');
+  
+  $status.hide().text(translate('Loading database ...')).fadeIn('slow');
+  $.ajax('/api/v1/devicestatus.json?count=500', {
+    success: function (records) {
+      var recs = (records.length === 500 ? '500+' : records.length);
+      $status.hide().text(translate('Database contains %1 records',{ params: [recs] })).fadeIn('slow');
+    },
+    error: function () {
+      $status.hide().text(translate('Error loading database')).fadeIn('slow');
+    }
+  }).done(function () { if (callback) { callback(); } });
+};
+
+cleanstatusdb.actions[0].code =  function deleteRecords(client, callback) {
+  var translate = client.translate;
+  var $status = $('#admin_' + cleanstatusdb.name + '_0_status');
+  
+  if (!client.hashauth.isAuthenticated()) {
+    alert(translate('Your device is not authenticated yet'));
+    if (callback) {
+      callback();
+    }
+    return;
+  };
+
+  $status.hide().text(translate('Deleting records ...')).fadeIn('slow');
+  $.ajax({
+      method: 'DELETE'
+    , url: '/api/v1/devicestatus/*'
+    , headers: {
+      'api-secret': client.hashauth.hash()
+    }
+  }).done(function success () {
+    $status.hide().text(translate('All records removed ...')).fadeIn('slow');
+    if (callback) {
+      callback();
+    }
+  }).fail(function fail() {
+    $status.hide().text(translate('Error')).fadeIn('slow');
+    if (callback) {
+      callback();
+    }
+  });
+};
diff --git a/lib/admin_plugins/futureitems.js b/lib/admin_plugins/futureitems.js
new file mode 100644
index 00000000000..ab888aff0a6
--- /dev/null
+++ b/lib/admin_plugins/futureitems.js
@@ -0,0 +1,172 @@
+'use strict';
+
+var futureitems = {
+  name: 'futureitems'
+  , label: 'Remove future items from mongo database'
+  , pluginType: 'admin'
+};
+
+function init() {
+  return futureitems;
+}
+
+module.exports = init;
+
+futureitems.actions = [
+    {
+        name: 'Find and remove treatments in the future'
+      , description: 'This task find and remove treatments in the future.'
+      , buttonLabel: 'Remove treatments in the future'
+    }
+    , {
+        name: 'Find and remove entries in the future'
+      , description: 'This task find and remove CGM data in the future created by uploader with wrong date/time.'
+      , buttonLabel: 'Remove entries in the future'
+    }
+  ];
+
+futureitems.actions[0].init = function init(client, callback) {
+  var translate = client.translate;
+  var $status = $('#admin_' + futureitems.name + '_0_status');
+  
+  function valueOrEmpty (value) {
+    return value ? value : '';
+  }
+  
+  function showOneTreatment (tr, table) {
+    table.append($('<tr>').css('background-color','#0f0f0f')
+      .append($('<td>').attr('width','20%').append(new Date(tr.created_at).toLocaleString().replace(/([\d]+:[\d]{2})(:[\d]{2})(.*)/, '$1$3')))
+      .append($('<td>').attr('width','20%').append(tr.eventType ? translate(client.careportal.resolveEventName(tr.eventType)) : ''))
+      .append($('<td>').attr('width','10%').attr('align','center').append(tr.glucose ? tr.glucose + ' ('+translate(tr.glucoseType)+')' : ''))
+      .append($('<td>').attr('width','10%').attr('align','center').append(valueOrEmpty(tr.insulin)))
+      .append($('<td>').attr('width','10%').attr('align','center').append(valueOrEmpty(tr.carbs)))
+      .append($('<td>').attr('width','10%').append(valueOrEmpty(tr.enteredBy)))
+      .append($('<td>').attr('width','20%').append(valueOrEmpty(tr.notes)))
+    );
+  }
+  
+  function showTreatments(treatments, table) {
+    table.append($('<tr>').css('background','#040404')
+      .append($('<th>').css('width','80px').attr('align','left').append(translate('Time')))
+      .append($('<th>').css('width','150px').attr('align','left').append(translate('Event Type')))
+      .append($('<th>').css('width','150px').attr('align','left').append(translate('Blood Glucose')))
+      .append($('<th>').css('width','50px').attr('align','left').append(translate('Insulin')))
+      .append($('<th>').css('width','50px').attr('align','left').append(translate('Carbs')))
+      .append($('<th>').css('width','150px').attr('align','left').append(translate('Entered By')))
+      .append($('<th>').css('width','300px').attr('align','left').append(translate('Notes')))
+    );
+    for (var t=0; t<treatments.length; t++) {
+      showOneTreatment (treatments[t], table);
+    }
+  };
+
+  $status.hide().text(translate('Loading database ...')).fadeIn('slow');
+  var nowiso = new Date().toISOString();
+  $.ajax('/api/v1/treatments.json?&find[created_at][$gte]=' + nowiso, {
+    success: function (records) {
+      futureitems.treatmentrecords = records;
+      $status.hide().text(translate('Database contains %1 future records',{ params: [records.length] })).fadeIn('slow');
+      var table =  $('<table>').css('margin-top','10px');
+      $('#admin_' + futureitems.name + '_0_html').append(table);
+      showTreatments(records, table);
+      futureitems.actions[0].confirmText = translate('Remove %1 selected records?', { params: [records.length] });
+    },
+    error: function () {
+      $status.hide().text(translate('Error loading database')).fadeIn('slow');
+      futureitems.treatmentrecords = [];
+    }
+  }).done(function () { if (callback) { callback(); } });
+};
+
+futureitems.actions[0].code =  function deleteRecords(client, callback) {
+  var translate = client.translate;
+  var $status = $('#admin_' + futureitems.name + '_0_status');
+  
+  if (!client.hashauth.isAuthenticated()) {
+    alert(translate('Your device is not authenticated yet'));
+    if (callback) {
+      callback();
+    }
+    return;
+  };
+
+  function deleteRecordById (_id) {
+    $.ajax({
+        method: 'DELETE'
+      , url: '/api/v1/treatments/' + _id
+      , headers: {
+        'api-secret': client.hashauth.hash()
+      }
+    }).done(function success () {
+      $status.text(translate('Record %1 removed ...', { params: [_id] }));
+    }).fail(function fail() {
+      $status.text(translate('Error removing record %1',  { params: [_id] }));
+    });
+  }
+  
+  $status.hide().text(translate('Deleting records ...')).fadeIn('slow');
+  for (var i = 0; i < futureitems.treatmentrecords.length; i++) {
+    deleteRecordById(futureitems.treatmentrecords[i]._id);
+  }
+  $('#admin_' + futureitems.name + '_0_html').html('');
+  
+  if (callback) {
+    callback();
+  }
+};
+
+futureitems.actions[1].init = function init(client, callback) {
+  var translate = client.translate;
+  var $status = $('#admin_' + futureitems.name + '_1_status');
+  
+  $status.hide().text(translate('Loading database ...')).fadeIn('slow');
+  var now = new Date().getTime();
+  $.ajax('/api/v1/entries.json?&find[date][$gte]=' + now, {
+    success: function (records) {
+      futureitems.entriesrecords = records;
+      $status.hide().text(translate('Database contains %1 future records',{ params: [records.length] })).fadeIn('slow');
+      futureitems.actions[1].confirmText = translate('Remove %1 selected records?', { params: [records.length] });
+    },
+    error: function () {
+      $status.hide().text(translate('Error loading database')).fadeIn('slow');
+      futureitems.entriesrecords = [];
+    }
+  }).done(function () { if (callback) { callback(); } });
+};
+
+futureitems.actions[1].code =  function deleteRecords(client, callback) {
+  var translate = client.translate;
+  var $status = $('#admin_' + futureitems.name + '_1_status');
+  
+  if (!client.hashauth.isAuthenticated()) {
+    alert(translate('Your device is not authenticated yet'));
+    if (callback) {
+      callback();
+    }
+    return;
+  };
+  
+  function deteleteRecordById (_id) {
+    $.ajax({
+        method: 'DELETE'
+      , url: '/api/v1/entries/' + _id
+      , headers: {
+        'api-secret': client.hashauth.hash()
+      }
+    }).done(function success () {
+      $status.text(translate('Record %1 removed ...', { params: [_id] }));
+    }).fail(function fail() {
+      $status.text(translate('Error removing record %1',  { params: [_id] }));
+    });
+  }
+  
+
+  $status.hide().text(translate('Deleting records ...')).fadeIn('slow');
+  for (var i = 0; i < futureitems.entriesrecords.length; i++) {
+    deteleteRecordById(futureitems.entriesrecords[i]._id);
+  }
+  
+  if (callback) {
+    callback();
+  }
+};
diff --git a/lib/admin_plugins/index.js b/lib/admin_plugins/index.js
new file mode 100644
index 00000000000..f7a5c74133d
--- /dev/null
+++ b/lib/admin_plugins/index.js
@@ -0,0 +1,79 @@
+'use strict';
+
+var _ = require('lodash');
+
+function init() {
+    var allPlugins = [
+        require('./cleanstatusdb')()
+      , require('./futureitems')()
+    ];
+
+  function plugins(name) {
+    if (name) {
+      return _.find(allPlugins, {name: name});
+    } else {
+      return plugins;
+    }
+  }
+
+  plugins.eachPlugin = function eachPlugin(f) {
+    _.each(allPlugins, f);
+  };
+
+  plugins.createHTML = function createHTML(client) {
+    var translate = client.translate;
+    plugins.eachPlugin(function addHtml(p) {
+      var fs = $('<fieldset>');
+      $('#admin_placeholder').append(fs);
+      fs.append($('<legend>').append(translate(p.label)));
+      for (var i = 0; i < p.actions.length; i++) {
+        if (i !== 0) {
+          fs.append('<hr>');
+        }
+        var a = p.actions[i];
+        // add main plugin html
+        fs.append($('<b>').css('text-decoration','underline').append(translate(a.name)));
+        fs.append('<br>');
+        fs.append($('<i>').append(translate(a.description)));
+        fs.append($('<div>').attr('id','admin_' + p.name + '_' + i + '_html'));
+        fs.append($('<button>').addClass('adminButton').attr('plugin',p.name).attr('action',i).append(translate(a.buttonLabel)));
+        fs.append($('<span>').attr('id','admin_' + p.name + '_' + i + '_status'));
+        if (a.init) {
+          a.init(client);
+        }
+      }
+      // add css
+      if (p.css) {
+        $('<style>')
+          .prop('type', 'text/css')
+          .html(p.css)
+          .appendTo('head');
+      }
+    });
+    $('.adminButton').click(plugins.doAction);
+  };
+
+  plugins.doAction = function doAction(event) {
+    var Nightscout = window.Nightscout;
+    var plugin = $(this).attr('plugin');
+    var action = $(this).attr('action');
+    var a = plugins(plugin).actions[action];
+    var ok = true;
+    if (a.confirmText) {
+      ok = window.confirm(Nightscout.client.translate(a.confirmText));
+    }
+    if (ok) {
+      console.log('Running action', action, 'on plugin', plugin);
+      a.code(Nightscout.client);
+      $(this).css('display','none');
+    }
+    if (event) {
+      event.preventDefault();
+    }
+  };
+
+  return plugins();
+
+}
+
+module.exports = init;
\ No newline at end of file
diff --git a/lib/api/devicestatus/index.js b/lib/api/devicestatus/index.js
index 49e1ac36d8b..dc45e5bc061 100644
--- a/lib/api/devicestatus/index.js
+++ b/lib/api/devicestatus/index.js
@@ -38,6 +38,16 @@ function configure (app, wares, ctx) {
         }
       });
     });
+    // delete record
+    api.delete('/devicestatus/:_id', wares.verifyAuthorization, function(req, res) {
+      ctx.devicestatus.remove(req.params._id, function (err, removed) {
+        if (err) {
+          res.sendJSONStatus(res, consts.HTTP_INTERNAL_ERROR, 'Mongo Error', err);
+        } else {
+          res.json(removed);
+        }
+      });
+    });
 
   }
 
diff --git a/lib/api/entries/index.js b/lib/api/entries/index.js
index 3e5cbb94d80..2d285324786 100644
--- a/lib/api/entries/index.js
+++ b/lib/api/entries/index.js
@@ -253,7 +253,7 @@ function configure (app, wares, ctx) {
           if (entry) {
             req.query.find.type = entry.type;
           } else {
-            res.entries_err = "No such id: '" + req.params.spec + "'";
+            res.entries_err = 'No such id: \'' + req.params.spec + '\'';
           }
           next();
         });
diff --git a/lib/api/treatments/index.js b/lib/api/treatments/index.js
index 65a7cccdba6..4afa0ee4407 100644
--- a/lib/api/treatments/index.js
+++ b/lib/api/treatments/index.js
@@ -6,14 +6,16 @@ function configure (app, wares, ctx) {
   var express = require('express'),
     api = express.Router( );
 
-  // invoke common middleware
-  api.use(wares.sendJSONStatus);
+  api.use(wares.compression( ));
+  api.use(wares.bodyParser({limit: 1048576 * 50}));
   // text body types get handled as raw buffer stream
-  api.use(wares.bodyParser.raw( ));
+  api.use(wares.bodyParser.raw({limit: 1048576 }));
   // json body types get handled as parsed json
-  api.use(wares.bodyParser.json( ));
+  api.use(wares.bodyParser.json({limit: 1048576 }));
   // also support url-encoded content-type
-  api.use(wares.bodyParser.urlencoded({ extended: true }));
+  api.use(wares.bodyParser.urlencoded({limit: 1048576 , extended: true }));
+  // invoke common middleware
+  api.use(wares.sendJSONStatus);
 
   // List treatments available
   api.get('/treatments/', function(req, res) {
@@ -37,9 +39,9 @@ function configure (app, wares, ctx) {
       });
     }
     if (app.settings.treatments_auth) {
-      api.post('/treatments/', wares.verifyAuthorization, post_response);
+      api.post('/treatments/', wares.bodyParser({limit: 1048576 * 50 }), wares.verifyAuthorization, post_response);
     } else  {
-      api.post('/treatments/', post_response);
+      api.post('/treatments/', wares.bodyParser({limit: 1048576 * 50 }), post_response);
     }
     api.delete('/treatments/:_id', wares.verifyAuthorization, function(req, res) {
       ctx.treatments.remove(req.params._id, function ( ) {
diff --git a/lib/bootevent.js b/lib/bootevent.js
index 6a0c920dd98..2e2665dfa33 100644
--- a/lib/bootevent.js
+++ b/lib/bootevent.js
@@ -87,6 +87,14 @@ function boot (env) {
     next( );
   }
 
+  function setupMMConnect (ctx, next) {
+    ctx.mmconnect = require('./plugins/mmconnect').init(env, ctx.entries);
+    if (ctx.mmconnect) {
+      ctx.mmconnect.run();
+    }
+    next( );
+  }
+
   function finishBoot (ctx, next) {
     ctx.bus.uptime( );
 
@@ -99,6 +107,7 @@ function boot (env) {
     .acquire(ensureIndexes)
     .acquire(setupListeners)
     .acquire(setupBridge)
+    .acquire(setupMMConnect)
     .acquire(finishBoot);
 }
 
diff --git a/lib/client/browser-settings.js b/lib/client/browser-settings.js
index e49b05cb04f..30e4bb79edb 100644
--- a/lib/client/browser-settings.js
+++ b/lib/client/browser-settings.js
@@ -57,6 +57,10 @@ function init (client, plugins, serverSettings, $) {
 
     langSelect.val(settings.language);
 
+    $('#scaleY').val(settings.scaleY);
+
+    $('#basalrender').val(settings.extendedSettings.basal ? settings.extendedSettings.basal.render : 'none');
+
     if (settings.timeFormat === 24) {
       $('#24-browser').prop('checked', true);
     } else {
@@ -88,6 +92,7 @@ function init (client, plugins, serverSettings, $) {
       settings.eachSetting(function clearEachSetting (name) {
         storage.remove(name);
       });
+      storage.remove('basalrender');
       event.preventDefault();
       client.browserUtils.reload();
     });
@@ -123,8 +128,10 @@ function init (client, plugins, serverSettings, $) {
         showRawbg: $('input:radio[name=show-rawbg]:checked').val(),
         customTitle: $('input#customTitle').prop('value'),
         theme: $('input:radio[name=theme-browser]:checked').val(),
-        timeFormat: $('input:radio[name=timeformat-browser]:checked').val(),
+        timeFormat: parseInt($('input:radio[name=timeformat-browser]:checked').val()),
         language: $('#language').val(),
+        scaleY: $('#scaleY').val(),
+        basalrender: $('#basalrender').val(),
         showPlugins: checkedPluginNames()
       });
 
@@ -139,18 +146,26 @@ function init (client, plugins, serverSettings, $) {
     $('#save').hide();
   }
 
+  settings.extendedSettings = serverSettings.extendedSettings;
+
   try {
     settings.eachSetting(function setEach (name) {
       var stored = storage.get(name);
-      return stored !== undefined && stored !== null ? storage.get(name) : serverSettings.settings[name];
+      return stored !== undefined && stored !== null ? stored : serverSettings.settings[name];
     });
+
+    if (!settings.extendedSettings.basal) {
+      settings.extendedSettings.basal = {};
+    }
+
+    var stored = storage.get('basalrender');
+    settings.extendedSettings.basal.render = stored !== null ? stored : settings.extendedSettings.basal.render;
   } catch(err) {
     console.error(err);
     showLocalstorageError();
   }
 
   settings.thresholds = serverSettings.settings.thresholds;
-  settings.extendedSettings = serverSettings.extendedSettings;
   settings.enable = serverSettings.settings.enable;
 
   if (settings.enable.indexOf('ar2') < 0) {
diff --git a/lib/client/careportal.js b/lib/client/careportal.js
index 3d153e5ee42..30d87098e9f 100644
--- a/lib/client/careportal.js
+++ b/lib/client/careportal.js
@@ -2,6 +2,8 @@
 
 var moment = require('moment-timezone');
 var _ = require('lodash');
+var parse_duration = require('parse-duration'); // https://www.npmjs.com/package/parse-duration
+var times = require('../times');
 
 function init (client, $) {
   var careportal = { };
@@ -10,7 +12,8 @@ function init (client, $) {
   var storage = $.localStorage;
 
   careportal.events = [
-      { val: 'BG Check', name: 'BG Check' }
+      { val: '<none>', name: '<none>' }
+    , { val: 'BG Check', name: 'BG Check' }
     , { val: 'Snack Bolus', name: 'Snack Bolus' }
     , { val: 'Meal Bolus', name: 'Meal Bolus' }
     , { val: 'Correction Bolus', name: 'Correction Bolus' }
@@ -23,6 +26,8 @@ function init (client, $) {
     , { val: 'Sensor Start', name: 'Dexcom Sensor Start' }
     , { val: 'Sensor Change', name: 'Dexcom Sensor Change' }
     , { val: 'Insulin Change', name: 'Insulin Cartridge Change' }
+    , { val: 'Temp Basal Start', name: 'Temp Basal Start' }
+    , { val: 'Temp Basal End', name: 'Temp Basal End' }
     , { val: 'D.A.D. Alert', name: 'D.A.D. Alert' }
   ];
   
@@ -50,11 +55,70 @@ function init (client, $) {
     }
   }
 
+  careportal.filterInputs = function filterInputs ( event ) {
+    var inputMatrix = {
+      '<none>':            { bg: true,  insulin: true,  carbs: true,  prebolus: false, duration: false, percent: false, absolute: false  }
+    , 'BG Check':          { bg: true,  insulin: false, carbs: false, prebolus: false, duration: false, percent: false, absolute: false  }
+    , 'Snack Bolus':       { bg: true,  insulin: true,  carbs: true,  prebolus: true,  duration: false, percent: false, absolute: false  }
+    , 'Meal Bolus':        { bg: true,  insulin: true,  carbs: true,  prebolus: true,  duration: false, percent: false, absolute: false  }
+    , 'Correction Bolus':  { bg: true,  insulin: true,  carbs: false, prebolus: false, duration: false, percent: false, absolute: false  }
+    , 'Carb Correction':   { bg: true,  insulin: false, carbs: true,  prebolus: false, duration: false, percent: false, absolute: false  }
+    , 'Announcement':      { bg: true,  insulin: false, carbs: false, prebolus: false, duration: false, percent: false, absolute: false  }
+    , 'Note':              { bg: true,  insulin: false, carbs: false, prebolus: false, duration: true,  percent: false, absolute: false  }
+    , 'Question':          { bg: true,  insulin: false, carbs: false, prebolus: false, duration: false, percent: false, absolute: false  }
+    , 'Exercise':          { bg: false, insulin: false, carbs: false, prebolus: false, duration: true,  percent: false, absolute: false  }
+    , 'Site Change':       { bg: true,  insulin: true,  carbs: false, prebolus: false, duration: false, percent: false, absolute: false  }
+    , 'Sensor Start':      { bg: true,  insulin: false, carbs: false, prebolus: false, duration: false, percent: false, absolute: false  }
+    , 'Sensor Change':     { bg: true,  insulin: false, carbs: false, prebolus: false, duration: false, percent: false, absolute: false  }
+    , 'Insulin Change':    { bg: true,  insulin: true,  carbs: false, prebolus: false, duration: false, percent: false, absolute: false  }
+    , 'Temp Basal Start':  { bg: true,  insulin: false, carbs: false, prebolus: false, duration: true,  percent: true,  absolute: true   }
+    , 'Temp Basal End':    { bg: true,  insulin: false, carbs: false, prebolus: false, duration: false, percent: false, absolute: false  }
+    , 'D.A.D. Alert':      { bg: true,  insulin: false, carbs: false, prebolus: false, duration: false, percent: false, absolute: false  }
+    };
+
+    var eventType = $('#eventType').val();
+    
+    function displayType (enabled) {
+      if (enabled) {
+        return '';
+      } else {
+        return 'none';
+      }
+    }
+    
+    function resetIfHidden(visible, id) {
+      if (!visible) {
+        $(id).val('');
+      }
+    }
+    
+    $('#bg').css('display',displayType(inputMatrix[eventType]['bg']));
+    $('#insulinGivenLabel').css('display',displayType(inputMatrix[eventType]['insulin']));
+    $('#carbsGivenLabel').css('display',displayType(inputMatrix[eventType]['carbs']));
+    $('#durationLabel').css('display',displayType(inputMatrix[eventType]['duration']));
+    $('#percentLabel').css('display',displayType(inputMatrix[eventType]['percent'] && $('#absolute').val() === ''));
+    $('#absoluteLabel').css('display',displayType(inputMatrix[eventType]['absolute'] && $('#percent').val() === ''));
+    $('#preBolusLabel').css('display',displayType(inputMatrix[eventType]['prebolus']));
+ 
+    resetIfHidden(inputMatrix[eventType]['insulin'], '#insulinGiven');
+    resetIfHidden(inputMatrix[eventType]['carbs'], '#carbsGiven');
+    resetIfHidden(inputMatrix[eventType]['duration'], '#duration');
+    resetIfHidden(inputMatrix[eventType]['absolute'], '#absolute');
+    resetIfHidden(inputMatrix[eventType]['percent'], '#percent');
+    resetIfHidden(inputMatrix[eventType]['prebolus'], '#preBolus');
+    
+    maybePrevent(event);
+  };
+
   careportal.prepareEvents = function prepareEvents ( ) {
     $('#eventType').empty();
     _.each(careportal.events, function eachEvent(event) {
       $('#eventType').append('<option value="' + event.val+ '">' + translate(event.name) + '</option>');
     });
+    $('#eventType').change(careportal.filterInputs);
+    $('#percentLabel').change(careportal.filterInputs);
+    $('#absoluteLabel').change(careportal.filterInputs);
+    careportal.filterInputs();
   };
 
   careportal.resolveEventName = function resolveEventName(value) {
@@ -68,11 +132,14 @@ function init (client, $) {
 
   careportal.prepare = function prepare ( ) {
     careportal.prepareEvents();
-    $('#eventType').val('BG Check');
+    $('#eventType').val('<none>');
     $('#glucoseValue').val('').attr('placeholder', translate('Value in') + ' ' + client.settings.units);
     $('#meter').prop('checked', true);
     $('#carbsGiven').val('');
     $('#insulinGiven').val('');
+    $('#duration').val('');
+    $('#percent').val('');
+    $('#absolute').val('');
     $('#preBolus').val(0);
     $('#notes').val('');
     $('#enteredBy').val(storage.get('enteredBy') || '');
@@ -88,14 +155,26 @@ function init (client, $) {
     , glucoseType: $('#treatment-form').find('input[name=glucoseType]:checked').val()
     , carbs: $('#carbsGiven').val()
     , insulin: $('#insulinGiven').val()
+    , duration: times.msecs(parse_duration($('#duration').val())).mins < 1 ? $('#duration').val() : times.msecs(parse_duration($('#duration').val())).mins
+    , percent: $('#percent').val()
     , preBolus: parseInt($('#preBolus').val())
     , notes: $('#notes').val()
     , units: client.settings.units
     };
 
+    //special handling for absolute to support temp to 0
+    var absolute = $('#absolute').val();
+    if ('' !== absolute && !isNaN(absolute)) {
+      data.absolute = Number(absolute);
+    }
+
     if ($('#othertime').is(':checked')) {
       data.eventTime = mergeDateAndTime().toDate();
     }
+    
+    if (data.eventType.indexOf('Temp Basal') > -1) {
+      data.eventType = 'Temp Basal';
+    }
 
     return data;
   }
@@ -123,6 +202,9 @@ function init (client, $) {
 
     pushIf(data.carbs, translate('Carbs Given') + ': ' + data.carbs);
     pushIf(data.insulin, translate('Insulin Given') + ': ' + data.insulin);
+    pushIf(data.duration, translate('Duration') + ': ' + data.duration);
+    pushIf(data.percent, translate('Percent') + ': ' + data.percent);
+    pushIf(data.absolute, translate('Basal value') + ': ' + data.absolute);
     pushIf(data.preBolus, translate('Carb Time') + ': ' + data.preBolus + ' ' + translate('mins'));
     pushIf(data.notes, translate('Notes') + ': ' + data.notes);
     pushIf(data.enteredBy, translate('Entered By') + ': ' + data.enteredBy);
diff --git a/lib/client/chart.js b/lib/client/chart.js
index 0bf887693a9..c4512c7cf55 100644
--- a/lib/client/chart.js
+++ b/lib/client/chart.js
@@ -2,6 +2,7 @@
 
 var _ = require('lodash');
 var times = require('../times');
+var d3locales = require('../d3locales');
 
 var DEBOUNCE_MS = 10
   , padding = { bottom: 30 }
@@ -13,6 +14,8 @@ function init (client, d3, $) {
   var utils = client.utils;
   var renderer = client.renderer;
 
+  var localeFormatter = d3.locale(d3locales.locale(client.settings.language));
+  
   function brushStarted ( ) {
     // update the opacity of the context data points to brush extent
     chart.context.selectAll('circle')
@@ -29,18 +32,52 @@ function init (client, d3, $) {
 
   var extent = client.dataExtent();
 
+  var yScaleType;
+  if (client.settings.scaleY === 'linear') {
+    yScaleType = d3.scale.linear;
+  } else {
+    yScaleType = d3.scale.log;
+  }
+
+  var focusYDomain = [utils.scaleMgdl(30), utils.scaleMgdl(510)];
+  var contextYDomain = [utils.scaleMgdl(36), utils.scaleMgdl(420)];
+
+  function dynamicDomain() {
+    var mult = 1.3
+      , targetTop = client.settings.thresholds.bgTargetTop
+      , mgdlMax = d3.max(client.data, function (d) { return d.mgdl; });
+
+    return [
+      utils.scaleMgdl(30)
+      , Math.max(utils.scaleMgdl(mgdlMax * mult), utils.scaleMgdl(targetTop * mult))
+    ];
+  }
+
+  function dynamicDomainOrElse(defaultDomain) {
+    if (client.settings.scaleY === 'linear' || client.settings.scaleY === 'log-dynamic') {
+      return dynamicDomain();
+    } else {
+      return defaultDomain;
+    }
+  }
+  
   // define the parts of the axis that aren't dependent on width or height
   var xScale = chart.xScale = d3.time.scale().domain(extent);
 
-  var yScale = chart.yScale = d3.scale.log()
-    .domain([utils.scaleMgdl(30), utils.scaleMgdl(510)]);
+  var yScale = chart.yScale = yScaleType()
+    .domain(dynamicDomainOrElse(focusYDomain));
 
   var xScale2 = chart.xScale2 = d3.time.scale().domain(extent);
 
-  var yScale2 = chart.yScale2 = d3.scale.log()
-    .domain([utils.scaleMgdl(36), utils.scaleMgdl(420)]);
+  var yScale2 = chart.yScale2 = yScaleType()
+    .domain(dynamicDomainOrElse(contextYDomain));
+
+  chart.xScaleBasals = d3.time.scale().domain(extent);
 
-  var tickFormat = d3.time.format.multi(  [
+  chart.yScaleBasals = d3.scale.linear()
+    .domain([0, 5]);
+
+  var tickFormat = localeFormatter.timeFormat.multi(  [
     ['.%L', function(d) { return d.getMilliseconds(); }],
     [':%S', function(d) { return d.getSeconds(); }],
     ['%I:%M', function(d) { return d.getMinutes(); }],
@@ -51,30 +88,7 @@ function init (client, d3, $) {
     ['%Y', function() { return true; }]
   ]);
 
-  // Tick Values
-  var tickValues;
-  if (client.settings.units === 'mmol') {
-    tickValues = [
-      2.0
-      , Math.round(utils.scaleMgdl(client.settings.thresholds.bgLow))
-      , Math.round(utils.scaleMgdl(client.settings.thresholds.bgTargetBottom))
-      , 6.0
-      , Math.round(utils.scaleMgdl(client.settings.thresholds.bgTargetTop))
-      , Math.round(utils.scaleMgdl(client.settings.thresholds.bgHigh))
-      , 22.0
-    ];
-  } else {
-    tickValues = [
-      40
-      , client.settings.thresholds.bgLow
-      , client.settings.thresholds.bgTargetBottom
-      , 120
-      , client.settings.thresholds.bgTargetTop
-      , client.settings.thresholds.bgHigh
-      , 400
-    ];
-  }
-
+  var tickValues = client.ticks(client);
 
   chart.xAxis = d3.svg.axis()
     .scale(xScale)
@@ -116,7 +130,10 @@ function init (client, d3, $) {
     .append('g')
     .attr('class', 'chartContainer');
 
-  chart.focus = chart.charts.append('g');
+  chart.basals = chart.charts.append('g').attr('class', 'chart-basals');
+  chart.basals.attr('display','none');
+
+  chart.focus = chart.charts.append('g').attr('class', 'chart-focus');
 
   // create the x axis container
   chart.focus.append('g')
@@ -126,7 +143,7 @@ function init (client, d3, $) {
   chart.focus.append('g')
     .attr('class', 'y axis');
 
-  chart.context = chart.charts.append('g');
+  chart.context = chart.charts.append('g').attr('class', 'chart-context');
 
   // create the x axis container
   chart.context.append('g')
@@ -184,6 +201,7 @@ function init (client, d3, $) {
     // get the height of each chart based on its container size ratio
     var focusHeight = chart.focusHeight = chartHeight * .7;
     var contextHeight = chart.contextHeight = chartHeight * .2;
+    chart.basalsHeight = focusHeight / 4;
 
     // get current brush extent
     var currentBrushExtent = createAdjustedRange();
@@ -201,8 +219,10 @@ function init (client, d3, $) {
       // ranges are based on the width and height available so reset
       chart.xScale.range([0, chartWidth]);
       chart.xScale2.range([0, chartWidth]);
+      chart.xScaleBasals.range([0, chartWidth]);
       chart.yScale.range([focusHeight, 0]);
       chart.yScale2.range([chartHeight, chartHeight - contextHeight]);
+      chart.yScaleBasals.range([0, focusHeight / 4]);
 
       if (init) {
 
@@ -220,6 +240,10 @@ function init (client, d3, $) {
           .attr('transform', 'translate(0,' + chartHeight + ')')
           .call(chart.xAxis2);
 
+//        chart.basals.select('.y')
+//          .attr('transform', 'translate(0,' + 0 + ')')
+//          .call(chart.yAxisBasals);
+
         chart.context.append('g')
           .attr('class', 'x brush')
           .call(d3.svg.brush().x(chart.xScale2).on('brush', client.brushed))
@@ -291,18 +315,18 @@ function init (client, d3, $) {
           .attr('stroke', '#777');
 
         // add a y-axis line that opens up the brush extent from the context to the focus
-        chart.focus.append('line')
+        chart.context.append('line')
           .attr('class', 'open-top')
           .attr('stroke', '#111')
-          .attr('stroke-width', 15);
+          .attr('stroke-width', 12);
 
         // add a x-axis line that closes the the brush container on left side
-        chart.focus.append('line')
+        chart.context.append('line')
           .attr('class', 'open-left')
           .attr('stroke', 'white');
 
         // add a x-axis line that closes the the brush container on right side
-        chart.focus.append('line')
+        chart.context.append('line')
           .attr('class', 'open-right')
           .attr('stroke', 'white');
 
@@ -355,6 +379,12 @@ function init (client, d3, $) {
           .attr('transform', 'translate(0,' + chartHeight + ')')
           .call(chart.xAxis2);
 
+        chart.basals.transition();
+
+//        basalsTransition.select('.y')
+//          .attr('transform', 'translate(0,' + 0 + ')')
+//          .call(chart.yAxisBasals);
+
         if (chart.clip) {
           // reset clip to new dimensions
           chart.clip.transition()
@@ -404,7 +434,7 @@ function init (client, d3, $) {
           .attr('y2', chart.yScale(utils.scaleMgdl(client.settings.thresholds.bgLow)));
 
         // transition open-top line to correct location
-        chart.focus.select('.open-top')
+        chart.context.select('.open-top')
           .transition()
           .attr('x1', chart.xScale2(currentBrushExtent[0]))
           .attr('y1', chart.yScale(utils.scaleMgdl(30)))
@@ -412,7 +442,7 @@ function init (client, d3, $) {
           .attr('y2', chart.yScale(utils.scaleMgdl(30)));
 
         // transition open-left line to correct location
-        chart.focus.select('.open-left')
+        chart.context.select('.open-left')
           .transition()
           .attr('x1', chart.xScale2(currentBrushExtent[0]))
           .attr('y1', focusHeight)
@@ -420,7 +450,7 @@ function init (client, d3, $) {
           .attr('y2', chartHeight);
 
         // transition open-right line to correct location
-        chart.focus.select('.open-right')
+        chart.context.select('.open-right')
           .transition()
           .attr('x1', chart.xScale2(currentBrushExtent[1]))
           .attr('y1', focusHeight)
@@ -447,6 +477,7 @@ function init (client, d3, $) {
 
     // update domain
     chart.xScale2.domain(dataRange);
+    chart.xScaleBasals.domain(dataRange);
 
     var updateBrush = d3.select('.brush').transition();
     updateBrush
@@ -462,26 +493,28 @@ function init (client, d3, $) {
 
   chart.scroll = function scroll (nowDate) {
     chart.xScale.domain(createAdjustedRange());
+    chart.yScale.domain(dynamicDomainOrElse(focusYDomain));
+    chart.xScaleBasals.domain(createAdjustedRange());
 
     // remove all insulin/carb treatment bubbles so that they can be redrawn to correct location
     d3.selectAll('.path').remove();
 
     // transition open-top line to correct location
-    chart.focus.select('.open-top')
+    chart.context.select('.open-top')
       .attr('x1', chart.xScale2(chart.brush.extent()[0]))
       .attr('y1', chart.yScale(utils.scaleMgdl(30)))
       .attr('x2', chart.xScale2(new Date(chart.brush.extent()[1].getTime() + client.forecastTime)))
       .attr('y2', chart.yScale(utils.scaleMgdl(30)));
 
     // transition open-left line to correct location
-    chart.focus.select('.open-left')
+    chart.context.select('.open-left')
       .attr('x1', chart.xScale2(chart.brush.extent()[0]))
       .attr('y1', chart.focusHeight)
       .attr('x2', chart.xScale2(chart.brush.extent()[0]))
       .attr('y2', chart.prevChartHeight);
 
     // transition open-right line to correct location
-    chart.focus.select('.open-right')
+    chart.context.select('.open-right')
       .attr('x1', chart.xScale2(new Date(chart.brush.extent()[1].getTime() + client.forecastTime)))
       .attr('y1', chart.focusHeight)
       .attr('x2', chart.xScale2(new Date(chart.brush.extent()[1].getTime() + client.forecastTime)))
@@ -501,8 +534,11 @@ function init (client, d3, $) {
       .attr('x2', chart.xScale2(chart.brush.extent()[1]))
       .attr('y2', chart.yScale2(utils.scaleMgdl(420)));
 
-    // update x axis
+    // update x,y axis
     chart.focus.select('.x.axis').call(chart.xAxis);
+    chart.focus.select('.y.axis').call(chart.yAxis);
+
+    renderer.addBasals(client);
 
     renderer.addFocusCircles();
     renderer.addTreatmentCircles();
diff --git a/lib/client/index.js b/lib/client/index.js
index de0c626c0f2..ce9bfb670c0 100644
--- a/lib/client/index.js
+++ b/lib/client/index.js
@@ -49,6 +49,7 @@ client.init = function init(serverSettings, plugins) {
   client.browserUtils = require('./browser-utils')($);
   client.settings = require('./browser-settings')(client, plugins, serverSettings, $);
   client.utils = require('../utils')(client.settings);
+  client.ticks = require('./ticks');
 
   client.sbx = sandbox.clientInit(client.settings, client.now);
   client.rawbg = plugins('rawbg');
@@ -272,7 +273,7 @@ client.init = function init(serverSettings, plugins) {
     }
 
     function updatePlugins (sgvs, time) {
-      var pluginBase = plugins.base(majorPills, minorPills, statusPills, bgStatus, client.tooltip);
+      var pluginBase = plugins.base(majorPills, minorPills, statusPills, bgStatus, client.tooltip, $.localStorage);
 
       client.sbx = sandbox.clientInit(
         client.settings
@@ -766,7 +767,6 @@ client.init = function init(serverSettings, plugins) {
   $('#treatmentDrawerToggle').toggle(serverSettings.careportalEnabled);
   container.toggleClass('has-minor-pills', plugins.hasShownType('pill-minor', client.settings));
 
-
   function prepareData ( ) {
   // Post processing after data is in
     var temp1 = [ ];
@@ -810,6 +810,42 @@ client.init = function init(serverSettings, plugins) {
     MBGdata = mergeDataUpdate(d.delta,MBGdata, d.mbgs);
     client.treatments = mergeDataUpdate(d.delta, client.treatments, d.treatments);
 
+    // filter & prepare temp basals
+    var tempbasaltreatments = client.treatments.filter( function filterBasals(t) {
+      return t.eventType && t.eventType.indexOf('Temp Basal') > -1;
+    });
+    // cut temp basals by end events
+    // better to do it only on data update
+    var endevents = tempbasaltreatments.filter(function filterEnd(t) {
+      return ! t.duration;
+    });
+    
+    function cutIfInInterval(base, end) {
+      if (base.mills < end.mills && base.mills + times.mins(base.duration).msecs > end.mills) {
+        base.duration = times.msecs(end.mills-base.mills).mins;
+      }
+    }
+    
+    // cut by end events
+    tempbasaltreatments.forEach(function allTreatments(t) {
+      endevents.forEach(function allEndevents(e) {
+        cutIfInInterval(t, e);
+      });
+    });
+
+    // cut by overlaping events
+    tempbasaltreatments.forEach(function allTreatments(t) {
+      tempbasaltreatments.forEach(function allEndevents(e) {
+        cutIfInInterval(t, e);
+      });
+    });
+    
+    // store prepared temp basal treatments
+    client.tempbasaltreatments = tempbasaltreatments.filter(function filterEnd(t) {
+      return t.duration;
+    });
+    
+
     // Do some reporting on the console
     console.log('Total SGV data size', SGVdata.length);
     console.log('Total treatment data size', client.treatments.length);
@@ -843,4 +879,4 @@ client.init = function init(serverSettings, plugins) {
   }
 };
 
-module.exports = client;
\ No newline at end of file
+module.exports = client;
diff --git a/lib/client/renderer.js b/lib/client/renderer.js
index c475c0815cd..854bb9fc3f7 100644
--- a/lib/client/renderer.js
+++ b/lib/client/renderer.js
@@ -1,11 +1,13 @@
 'use strict';
 
+var _ = require('lodash');
 var times = require('../times');
 
 var DEFAULT_FOCUS = times.hours(3).msecs
   , WIDTH_SMALL_DOTS = 420
   , WIDTH_BIG_DOTS = 800
   , TOOLTIP_TRANS_MS = 200 // milliseconds
+  , TOOLTIP_WIDTH = 150 //min-width + padding
   ;
 
 function init (client, d3) {
@@ -37,6 +39,12 @@ function init (client, d3) {
     return radius / focusRangeAdjustment();
   };
 
+  function tooltipLeft ( ) {
+    var windowWidth = $(client.tooltip).parent().parent().width();
+    var left = d3.event.pageX + TOOLTIP_WIDTH < windowWidth ? d3.event.pageX : windowWidth - TOOLTIP_WIDTH - 10;
+    return left + 'px'
+  }
+
   function hideTooltip ( ) {
     client.tooltip.transition()
       .duration(TOOLTIP_TRANS_MS)
@@ -146,7 +154,7 @@ function init (client, d3) {
         (rawbgInfo.value ? '<br/><strong>' + translate('Raw BG') + ':</strong> ' + rawbgInfo.value : '') +
         (rawbgInfo.noise ? '<br/><strong>' + translate('Noise') + ':</strong> ' + rawbgInfo.noise : '') +
         '<br/><strong>' + translate('Time') + ':</strong> ' + client.formatTime(new Date(d.mills)))
-        .style('left', (d3.event.pageX) + 'px')
+        .style('left', tooltipLeft())
         .style('top', (d3.event.pageY + 15) + 'px');
     }
 
@@ -167,7 +175,7 @@ function init (client, d3) {
   renderer.addTreatmentCircles = function addTreatmentCircles ( ) {
     function treatmentTooltip (d) {
       return '<strong>'+translate('Time')+':</strong> ' + client.formatTime(new Date(d.mills)) + '<br/>' +
-        (d.eventType ? '<strong>'+translate('Treatment type')+':</strong> ' + d.eventType + '<br/>' : '') +
+        (d.eventType ? '<strong>'+translate('Treatment type')+':</strong> ' + translate(client.careportal.resolveEventName(d.eventType)) + '<br/>' : '') +
         (d.glucose ? '<strong>'+translate('BG')+':</strong> ' + d.glucose + (d.glucoseType ? ' (' + translate(d.glucoseType) + ')': '') + '<br/>' : '') +
         (d.enteredBy ? '<strong>'+translate('Entered By')+':</strong> ' + d.enteredBy + '<br/>' : '') +
         (d.notes ? '<strong>'+translate('Notes')+':</strong> ' + d.notes : '');
@@ -182,8 +190,8 @@ function init (client, d3) {
 
     //NOTE: treatments with insulin or carbs are drawn by drawTreatment()
     // bind up the focus chart data to an array of circles
-    var treatCircles = chart().focus.selectAll('rect').data(client.treatments.filter(function(treatment) {
-      return !treatment.carbs && !treatment.insulin;
+    var treatCircles = chart().focus.selectAll('treatment-dot').data(client.treatments.filter(function(treatment) {
+      return !treatment.carbs && !treatment.insulin && !treatment.duration && treatment.eventType.indexOf('Temp Basal') < 0;
     }));
 
     function prepareTreatCircles(sel) {
@@ -231,12 +239,87 @@ function init (client, d3) {
       .on('mouseover', function (d) {
         client.tooltip.transition().duration(TOOLTIP_TRANS_MS).style('opacity', .9);
         client.tooltip.html(d.isAnnouncement ? announcementTooltip(d) : treatmentTooltip(d))
-          .style('left', (d3.event.pageX) + 'px')
+          .style('left', tooltipLeft())
           .style('top', (d3.event.pageY + 15) + 'px');
       })
       .on('mouseout', hideTooltip);
 
     treatCircles.attr('clip-path', 'url(#clip)');
+    
+    // treatments with duration
+    var treatRects = chart().focus.selectAll('.g-duration').data(client.treatments.filter(function(treatment) {
+      return !treatment.carbs && !treatment.insulin && treatment.duration && treatment.eventType.indexOf('Temp Basal') < 0;
+    }));
+
+    function fillColor(d) {
+      // this is going to be updated by Event Type
+      var color = 'grey';
+      if (d.eventType === 'Exercise') {
+        color = 'Violet';
+      } else if (d.eventType === 'Note') {
+        color = 'Salmon';
+      }
+      return color;
+    }
+
+    // if already existing then transition each rect to its new position
+    treatRects.transition()
+       .attr('transform', function (d) {
+        return 'translate(' + chart().xScale(new Date(d.mills)) + ',' + chart().yScale(utils.scaleMgdl(50)) + ')';
+      });
+
+    chart().focus.selectAll('.g-duration-rect').transition()
+      .attr('width', function (d) {
+        return chart().xScale(new Date(d.mills + times.mins(d.duration).msecs)) - chart().xScale(new Date(d.mills));
+      });
+
+    chart().focus.selectAll('.g-duration-text').transition()
+      .attr('transform', function (d) {
+        return 'translate(' + (chart().xScale(new Date(d.mills + times.mins(d.duration).msecs)) - chart().xScale(new Date(d.mills)))/2 + ',' + 10 + ')';
+      });
+
+    // if new rect then just display
+    var gs = treatRects.enter().append('g')
+      .attr('class','g-duration')
+      .attr('transform', function (d) {
+        return 'translate(' + chart().xScale(new Date(d.mills)) + ',' + chart().yScale(utils.scaleMgdl(50)) + ')';
+      })
+      .on('mouseover', function (d) {
+        client.tooltip.transition().duration(TOOLTIP_TRANS_MS).style('opacity', .9);
+        client.tooltip.html(d.isAnnouncement ? announcementTooltip(d) : treatmentTooltip(d))
+          .style('left', tooltipLeft())
+          .style('top', (d3.event.pageY + 15) + 'px');
+      })
+      .on('mouseout', hideTooltip);
+
+    gs.append('rect')
+      .attr('class', 'g-duration-rect')
+      .attr('width', function (d) {
+        return chart().xScale(new Date(d.mills + times.mins(d.duration).msecs)) - chart().xScale(new Date(d.mills));
+      })
+      .attr('height', 20)
+      .attr('rx', 5)
+      .attr('ry', 5)
+      //.attr('stroke-width', 2)
+      .attr('opacity', .2)
+      //.attr('stroke', 'white')
+      .attr('fill', fillColor);
+
+    gs.append('text')
+      .attr('class', 'g-duration-text')
+      .style('font-size', 15)
+      .attr('fill', 'white')
+      .attr('text-anchor', 'middle')
+      .attr('dy', '.35em')
+      .attr('transform', function (d) {
+        return 'translate(' + (chart().xScale(new Date(d.mills + times.mins(d.duration).msecs)) - chart().xScale(new Date(d.mills)))/2 + ',' + 10 + ')';
+      })
+      .text(function (d) {
+        return d.notes;
+      });
+
+    
+    treatRects.attr('clip-path', 'url(#clip)');
   };
 
   renderer.addContextCircles = function addContextCircles ( ) {
@@ -337,18 +420,18 @@ function init (client, d3) {
   function appendTreatments(treatment, arc) {
     function treatmentTooltip() {
       client.tooltip.transition().duration(TOOLTIP_TRANS_MS).style('opacity', .9);
-      client.tooltip.html('<strong>' + translate('Time') + ':</strong> ' + client.formatTime(new Date(treatment.mills)) + '<br/>' + '<strong>' + translate('Treatment type') + ':</strong> ' + translate(treatment.eventType) + '<br/>' +
+      client.tooltip.html('<strong>' + translate('Time') + ':</strong> ' + client.formatTime(new Date(treatment.mills)) + '<br/>' + '<strong>' + translate('Treatment type') + ':</strong> ' + translate(client.careportal.resolveEventName(treatment.eventType)) + '<br/>' +
         (treatment.carbs ? '<strong>' + translate('Carbs') + ':</strong> ' + treatment.carbs + '<br/>' : '') +
         (treatment.insulin ? '<strong>' + translate('Insulin') + ':</strong> ' + treatment.insulin + '<br/>' : '') +
         (treatment.glucose ? '<strong>' + translate('BG') + ':</strong> ' + treatment.glucose + (treatment.glucoseType ? ' (' + translate(treatment.glucoseType) + ')' : '') + '<br/>' : '') +
         (treatment.enteredBy ? '<strong>' + translate('Entered By') + ':</strong> ' + treatment.enteredBy + '<br/>' : '') +
         (treatment.notes ? '<strong>' + translate('Notes') + ':</strong> ' + treatment.notes : '')
       )
-      .style('left', (d3.event.pageX) + 'px')
+      .style('left', tooltipLeft())
       .style('top', (d3.event.pageY + 15) + 'px');
     }
 
-    var treatmentDots = chart().focus.selectAll('treatment-dot')
+    var treatmentDots = chart().focus.selectAll('treatment-insulincarbs')
       .data(arc.data)
       .enter()
       .append('g')
@@ -422,6 +505,122 @@ function init (client, d3) {
     appendLabels(treatmentDots, arc, opts);
   };
 
+  renderer.addBasals = function addBasals (client) {
+
+    var mode = client.settings.extendedSettings.basal.render;
+    var profile = client.sbx.data.profile;
+    var linedata = [];
+    var notemplinedata = [];
+    var basalareadata = [];
+    var tempbasalareadata = [];
+    var from = chart().brush.extent()[0].getTime();
+    var to = Math.max(chart().brush.extent()[1].getTime(), new Date().getTime()) + client.forecastTime;
+    
+    var date = from;
+    var lastbasal = 0;
+
+    while (date <= to) {
+      var basalvalue = profile.getTempBasal(date, client.tempbasaltreatments);
+      if (!_.isEqual(lastbasal, basalvalue)) {
+        linedata.push( { d: date, b: basalvalue.tempbasal } );
+        notemplinedata.push( { d: date, b: basalvalue.basal } );
+        if (basalvalue.treatment) {
+          tempbasalareadata.push( { d: date, b: basalvalue.tempbasal } );
+          basalareadata.push( { d: date, b: 0 } );
+        } else {
+          basalareadata.push( { d: date, b: basalvalue.tempbasal } );
+          tempbasalareadata.push( { d: date, b: 0 } );
+        }
+      }
+      lastbasal = basalvalue;
+      date += times.mins(1).msecs;
+    }
+
+    var toTempBasal = profile.getTempBasal(to, client.tempbasaltreatments);
+
+    linedata.push( { d: to, b: toTempBasal.tempbasal } );
+    notemplinedata.push( { d: to, b: toTempBasal.basal } );
+    basalareadata.push( { d: to, b: toTempBasal.basal } );
+    tempbasalareadata.push( { d: to, b: toTempBasal.tempbasal } );
+
+    var max = d3.max(linedata, function (d) { return d.b; });
+    chart().yScaleBasals.domain('icicle' === mode ? [0, max] : [max, 0]);
+
+    chart().basals.selectAll('g').remove();
+    chart().basals.selectAll('.basalline').remove().data(linedata);
+    chart().basals.selectAll('.notempline').remove().data(notemplinedata);
+    chart().basals.selectAll('.basalarea').remove().data(basalareadata);
+    chart().basals.selectAll('.tempbasalarea').remove().data(tempbasalareadata);
+
+    var valueline = d3.svg.line()
+      .interpolate('step-after')
+      .x(function(d) { return chart().xScaleBasals(d.d); })
+      .y(function(d) { return chart().yScaleBasals(d.b); });
+
+    var area = d3.svg.area()
+      .interpolate('step-after')
+      .x(function(d) { return chart().xScaleBasals(d.d); })
+      .y0(chart().yScaleBasals(0))
+      .y1(function(d) { return chart().yScaleBasals(d.b); });
+      
+    var g = chart().basals.append('g');
+
+    g.append('path')
+      .attr('class', 'line basalline')
+      .attr('stroke', '#0099ff')
+      .attr('stroke-width', 1)
+      .attr('fill', 'none')
+      .attr('d', valueline(linedata))
+      .attr('clip-path', 'url(#clip)');
+
+    g.append('path')
+      .attr('class', 'line notempline')
+      .attr('stroke', '#0099ff')
+      .attr('stroke-width', 1)
+      .attr('stroke-dasharray', ('3, 3'))
+      .attr('fill', 'none')
+      .attr('d', valueline(notemplinedata))
+      .attr('clip-path', 'url(#clip)');
+
+    g.append('path')
+      .attr('class', 'area basalarea')
+      .datum(basalareadata)
+      .attr('fill', '#0099ff')
+      .attr('fill-opacity', .1)
+      .attr('stroke-width', 0)
+      .attr('d', area);
+
+    g.append('path')
+      .attr('class', 'area tempbasalarea')
+      .datum(tempbasalareadata)
+      .attr('fill', '#0099ff')
+      .attr('fill-opacity', .2)
+      .attr('stroke-width', 1)
+      .attr('d', area);
+    //console.log(tempbasals);
+
+    client.tempbasaltreatments.forEach(function (t) {
+      // only if basal and focus interval overlap and there is a chance to fit
+      if (t.mills < to && t.mills + times.mins(t.duration).msecs > from) {
+        var text = g.append('text')
+          .attr('class', 'tempbasaltext')
+          .style('font-size', 15)
+          .attr('fill', 'white')
+          .attr('text-anchor', 'middle')
+          .attr('dy', '.35em')
+          .attr('x', chart().xScaleBasals((Math.max(t.mills, from) + Math.min(t.mills + times.mins(t.duration).msecs, to))/2))
+          .attr('y', 10)
+          .text((t.percent ? (t.percent > 0 ? '+' : '') + t.percent + '%' : '') + (isNaN(t.absolute) ? '' : t.absolute + 'U'));
+        // better hide if not fit
+        if (text.node().getBBox().width > chart().xScaleBasals(t.mills + times.mins(t.duration).msecs) - chart().xScaleBasals(t.mills)) {
+          text.attr('display', 'none');
+        }
+      }
+    });
+
+    client.chart.basals.attr('display', !mode || 'none' === mode ? 'none' : '');
+  };
+
   return renderer;
 }
 
diff --git a/lib/client/ticks.js b/lib/client/ticks.js
new file mode 100644
index 00000000000..093a2775ebf
--- /dev/null
+++ b/lib/client/ticks.js
@@ -0,0 +1,81 @@
+'use strict';
+
+function prepare (client, opts) {
+  opts = checkOptions(client, opts);
+
+  if (opts.scaleY === 'linear') {
+    return prepareLinear(client, opts);
+  } else {
+    return prepareLog(client, opts);
+  }
+}
+
+function checkOptions (client, opts) {
+  opts = opts || {};
+  opts.scaleY = opts.scaleY || client.settings.scaleY;
+  //assume any values from opts are already scaled
+  //do any other scaling here
+  opts.high = opts.high || Math.round(client.utils.scaleMgdl(client.settings.thresholds.bgHigh));
+  opts.targetTop = opts.targetTop || Math.round(client.utils.scaleMgdl(client.settings.thresholds.bgTargetTop));
+  opts.targetBottom = opts.targetBottom || Math.round(client.utils.scaleMgdl(client.settings.thresholds.bgTargetBottom));
+  opts.low = opts.low || Math.round(client.utils.scaleMgdl(client.settings.thresholds.bgLow));
+
+  return opts;
+}
+
+function prepareLog (client, opts) {
+  if (client.settings.units === 'mmol') {
+    return [
+      2.0
+      , Math.round(client.utils.scaleMgdl(client.settings.thresholds.bgLow))
+      , opts.targetBottom
+      , 6.0
+      , opts.targetTop
+      , opts.high
+      , 22.0
+    ];
+  } else {
+    return [
+      40
+      , opts.low
+      , opts.targetBottom
+      , 120
+      , opts.targetTop
+      , opts.high
+      , 400
+    ];
+  }
+}
+
+function prepareLinear (client, opts) {
+  if (client.settings.units === 'mmol') {
+    return [
+      2.0
+      , 4.0
+      , 6.0
+      , 8.0
+      , 10.0
+      , 12.0
+      , 14.0
+      , 16.0
+      , 18.0
+      , 20.0
+      , 22.0
+    ];
+  } else {
+    return [
+      40
+      , 80
+      , 120
+      , 160
+      , 200
+      , 240
+      , 280
+      , 320
+      , 360
+      , 400
+    ];
+  }
+}
+
+module.exports = prepare;
\ No newline at end of file
diff --git a/lib/d3locales.js b/lib/d3locales.js
new file mode 100644
index 00000000000..afb04cbad5c
--- /dev/null
+++ b/lib/d3locales.js
@@ -0,0 +1,227 @@
+'use strict';
+
+// https://github.com/mbostock/d3/wiki/Localization
+// https://github.com/mbostock/d3/wiki/Time-Formatting#format
+// some are in node_modules/d3/src/locale
+
+
+var d3locales = { };
+
+d3locales.cs_CZ = {
+  decimal: ',',
+  thousands: '.',
+  grouping: [3],
+  currency: ['', 'CZK'],
+  dateTime: '%A %e %b %Y %X',
+  date: '%d.%m.%Y',
+  time: '%H:%M:%S',
+  periods: ['AM', 'PM'],
+  days: ['Neděle', 'Pondělí', 'Úterý', 'Středa', 'Čtvrtek', 'Pátek', 'Sobota'],
+  shortDays: ['Ne', 'Po', 'Út', 'St', 'Čt', 'Pá', 'So'],
+  months: ['Leden', 'Únor', 'Březen', 'Duben', 'Květen', 'Červen', 'Červenec', 'Srpen', 'Září', 'Říjen', 'Listopad', 'Prosinec'],
+  shortMonths: ['Led', 'Úno', 'Bře', 'Dub', 'Kvě', 'Čvn', 'Čvc', 'Srp', 'Zář', 'Říj', 'Lis', 'Pro']
+};
+
+d3locales.de_DE = {
+  decimal: ',',
+  thousands: '.',
+  grouping: [3],
+  currency: ['', ' €'],
+  dateTime: '%A, der %e. %B %Y, %X',
+  date: '%d.%m.%Y',
+  time: '%H:%M:%S',
+  periods: ['AM', 'PM'], // unused
+  days: ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'],
+  shortDays: ['So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'],
+  months: ['Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'],
+  shortMonths: ['Jan', 'Feb', 'Mrz', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez']
+};
+
+d3locales.en_US = {
+  decimal: '.',
+  thousands: ',',
+  grouping: [3],
+  currency: ['$', ''],
+  dateTime: '%a %b %e %X %Y',
+  date: '%m/%d/%Y',
+  time: '%H:%M:%S',
+  periods: ['AM', 'PM'],
+  days: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
+  shortDays: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+  months: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
+  shortMonths: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
+};
+
+d3locales.nb_NO = {
+  decimal: '.',
+  thousands: ',',
+  grouping: [3],
+  currency: ['', 'NOK'],
+  dateTime: '%a %b %e %X %Y',
+  date: '%d/%m-%Y',
+  time: '%H:%M:%S',
+  periods: ['AM', 'PM'],
+  days: ['Søndag', 'Mandag', 'Tirsdag', 'Onsdag', 'Torsdag', 'Fredag', 'Lørdag'],
+  shortDays: ['Søn', 'Man', 'Tir', 'Ons', 'Tor', 'Fre', 'Lør'],
+  months: ['Januar', 'Februar', 'Mars', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Desember'],
+  shortMonths: ['Jan', 'Feb', 'Mar', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Des']
+};
+
+d3locales.es_ES = {
+  decimal: ',',
+  thousands: '.',
+  grouping: [3],
+  currency: ['', ' €'],
+  dateTime: '%A, %e de %B de %Y, %X',
+  date: '%d/%m/%Y',
+  time: '%H:%M:%S',
+  periods: ['AM', 'PM'],
+  days: ['domingo', 'lunes', 'martes', 'miércoles', 'jueves', 'viernes', 'sábado'],
+  shortDays: ['dom', 'lun', 'mar', 'mié', 'jue', 'vie', 'sáb'],
+  months: ['enero', 'febrero', 'marzo', 'abril', 'mayo', 'junio', 'julio', 'agosto', 'septiembre', 'octubre', 'noviembre', 'diciembre'],
+  shortMonths: ['ene', 'feb', 'mar', 'abr', 'may', 'jun', 'jul', 'ago', 'sep', 'oct', 'nov', 'dic']
+};
+
+d3locales.fi_FI = {
+  decimal: ',',
+  thousands: '\xa0',
+  grouping: [3],
+  currency: ['', '\xa0€'],
+  dateTime: '%A, %-d. %Bta %Y klo %X',
+  date: '%-d.%-m.%Y',
+  time: '%H:%M:%S',
+  periods: ['a.m.', 'p.m.'],
+  days: ['sunnuntai', 'maanantai', 'tiistai', 'keskiviikko', 'torstai', 'perjantai', 'lauantai'],
+  shortDays: ['Su', 'Ma', 'Ti', 'Ke', 'To', 'Pe', 'La'],
+  months: ['tammikuu', 'helmikuu', 'maaliskuu', 'huhtikuu', 'toukokuu', 'kesäkuu', 'heinäkuu', 'elokuu', 'syyskuu', 'lokakuu', 'marraskuu', 'joulukuu'],
+  shortMonths: ['Tammi', 'Helmi', 'Maalis', 'Huhti', 'Touko', 'Kesä', 'Heinä', 'Elo', 'Syys', 'Loka', 'Marras', 'Joulu']
+};
+
+d3locales.fr_FR = {
+  decimal: ',',
+  thousands: '.',
+  grouping: [3],
+  currency: ['', ' €'],
+  dateTime: '%A, le %e %B %Y, %X',
+  date: '%d/%m/%Y',
+  time: '%H:%M:%S',
+  periods: ['AM', 'PM'], // unused
+  days: ['dimanche', 'lundi', 'mardi', 'mercredi', 'jeudi', 'vendredi', 'samedi'],
+  shortDays: ['dim.', 'lun.', 'mar.', 'mer.', 'jeu.', 'ven.', 'sam.'],
+  months: ['janvier', 'février', 'mars', 'avril', 'mai', 'juin', 'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre'],
+  shortMonths: ['janv.', 'févr.', 'mars', 'avr.', 'mai', 'juin', 'juil.', 'août', 'sept.', 'oct.', 'nov.', 'déc.']
+};
+
+d3locales.he_IL = {
+  decimal: '.',
+  thousands: ',',
+  grouping: [3],
+  currency: ['₪', ''],
+  dateTime: '%A, %e ב%B %Y %X',
+  date: '%d.%m.%Y',
+  time: '%H:%M:%S',
+  periods: ['AM', 'PM'],
+  days: ['ראשון', 'שני', 'שלישי', 'רביעי', 'חמישי', 'שישי', 'שבת'],
+  shortDays: ['א׳', 'ב׳', 'ג׳', 'ד׳', 'ה׳', 'ו׳', 'ש׳'],
+  months: ['ינואר', 'פברואר', 'מרץ', 'אפריל', 'מאי', 'יוני', 'יולי', 'אוגוסט', 'ספטמבר', 'אוקטובר', 'נובמבר', 'דצמבר'],
+  shortMonths: ['ינו׳', 'פבר׳', 'מרץ', 'אפר׳', 'מאי', 'יוני', 'יולי', 'אוג׳', 'ספט׳', 'אוק׳', 'נוב׳', 'דצמ׳']
+};
+
+d3locales.it_IT = {
+  decimal: ',',
+  thousands: '.',
+  grouping: [3],
+  currency: ['€', ''],
+  dateTime: '%A %e %B %Y, %X',
+  date: '%d/%m/%Y',
+  time: '%H:%M:%S',
+  periods: ['AM', 'PM'], // unused
+  days: ['Domenica', 'Lunedì', 'Martedì', 'Mercoledì', 'Giovedì', 'Venerdì', 'Sabato'],
+  shortDays: ['Dom', 'Lun', 'Mar', 'Mer', 'Gio', 'Ven', 'Sab'],
+  months: ['Gennaio', 'Febbraio', 'Marzo', 'Aprile', 'Maggio', 'Giugno', 'Luglio', 'Agosto', 'Settembre', 'Ottobre', 'Novembre', 'Dicembre'],
+  shortMonths: ['Gen', 'Feb', 'Mar', 'Apr', 'Mag', 'Giu', 'Lug', 'Ago', 'Set', 'Ott', 'Nov', 'Dic']
+};
+
+d3locales.pt_BR = {
+  decimal: ',',
+  thousands: '.',
+  grouping: [3],
+  currency: ['R$', ''],
+  dateTime: '%A, %e de %B de %Y. %X',
+  date: '%d/%m/%Y',
+  time: '%H:%M:%S',
+  periods: ['AM', 'PM'],
+  days: ['Domingo', 'Segunda', 'Terça', 'Quarta', 'Quinta', 'Sexta', 'Sábado'],
+  shortDays: ['Dom', 'Seg', 'Ter', 'Qua', 'Qui', 'Sex', 'Sáb'],
+  months: ['Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho', 'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro'],
+  shortMonths: ['Jan', 'Fev', 'Mar', 'Abr', 'Mai', 'Jun', 'Jul', 'Ago', 'Set', 'Out', 'Nov', 'Dez']
+};
+
+d3locales.ro_RO = {
+  decimal: '.',
+  thousands: ',',
+  grouping: [3],
+  currency: ['', 'RON'],
+  dateTime: '%A %e %b %Y %X',
+  date: '%d.%m.%Y',
+  time: '%H:%M:%S',
+  periods: ['AM', 'PM'],
+  days: ['Duminică', 'Luni', 'Marți', 'Miercuri', 'Joi', 'Vineri', 'Sâmbătă'],
+  shortDays: ['Du', 'Lu', 'Ma', 'Mi', 'Jo', 'Vi', 'Sâ'],
+  months: ['Ianuarie', 'Februarie', 'Martie', 'Aprilie', 'Mai', 'Iunie', 'Iulie', 'August', 'Septembrie', 'Octombrie', 'Noiembrie', 'Decembrie'],
+  shortMonths: ['Ian', 'Feb', 'Mar', 'Apr', 'Mai', 'Iun', 'Iul', 'Aug', 'Sep', 'Oct', 'Noi', 'Dec']
+};
+
+d3locales.ru_RU = {
+  decimal: ',',
+  thousands: '\xa0',
+  grouping: [3],
+  currency: ['', ' руб.'],
+  dateTime: '%A, %e %B %Y г. %X',
+  date: '%d.%m.%Y',
+  time: '%H:%M:%S',
+  periods: ['AM', 'PM'],
+  days: ['воскресенье', 'понедельник', 'вторник', 'среда', 'четверг', 'пятница', 'суббота'],
+  shortDays: ['вс', 'пн', 'вт', 'ср', 'чт', 'пт', 'сб'],
+  months: ['Январь', 'Февраль', 'Март', 'Апрель', 'Май', 'Июнь', 'Июль', 'Август', 'Сентябрь', 'Октябрь', 'Ноябрь', 'Декабрь'],
+  shortMonths: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
+};
+d3locales.bg_BG = {
+  decimal: '.',
+  thousands: ',',
+  grouping: [3],
+  currency: ['', 'лев'],
+  dateTime: '%A, %e %B %Y г. %X',
+  date: '%d.%m.%Y',
+  time: '%H:%M:%S',
+  periods: ['AM', 'PM'],
+  days: ['Неделя', 'Понеделник', 'Вторник', 'Сряда', 'Четвъртък', 'Петък', 'Събота'],
+  shortDays: ['нд', 'пн', 'вт', 'ср', 'чт', 'пт', 'сб'],
+  months: ['Януари', 'Февруари', 'Март', 'Април', 'Май', 'Юни', 'Юли', 'Август', 'Септмври', 'Октомври', 'Ноември', 'Декември'],
+  shortMonths: ['Ян', 'Февр', 'Март', 'Апр', 'Май', 'Юни', 'Юли', 'Авг', 'Септ', 'Окт', 'Ноем', 'Дек']
+};
+
+d3locales.locale = function locale (language) {
+  // map locale until we switch to full en_US
+  var mapper = {
+      cs: 'cs_CZ'
+    , de: 'de_DE'
+    , en: 'en_US'
+    , es: 'es_ES'
+    , fi: 'fi_FI'
+    , fr: 'fr_FR'
+    , he: 'he_IL'
+    , it: 'it_IT'
+    , pt: 'pt_BR'
+    , ro: 'ro_RO'
+    , ru: 'ru_RU'
+    ,bg: 'bg_BG'
+  };
+  var loc = 'en_US';
+  if (mapper[language]) {
+    loc = mapper[language];
+  }
+  return d3locales[loc];
+};
+
+module.exports = d3locales;
diff --git a/lib/devicestatus.js b/lib/devicestatus.js
index 66d2ff3562c..6dd5eccb9ac 100644
--- a/lib/devicestatus.js
+++ b/lib/devicestatus.js
@@ -1,6 +1,9 @@
 'use strict';
 
+var find_options = require('./query');
+
 function storage (collection, ctx) {
+  var ObjectID = require('mongodb').ObjectID;
 
   function create(obj, fn) {
     if (! obj.hasOwnProperty('created_at')){
@@ -12,7 +15,7 @@ function storage (collection, ctx) {
   }
 
   function last(fn) {
-    return api().find({}).sort({created_at: -1}).limit(1).toArray(function (err, entries) {
+    return list({count: 1}, function (err, entries) {
       if (entries && entries.length > 0) {
         fn(err, entries[0]);
       } else {
@@ -21,9 +24,52 @@ function storage (collection, ctx) {
     });
   }
 
+  var with_collection = ctx.store.with_collection(collection);
+
+  function query_for (opts) {
+    return find_options(opts, storage.queryOpts);
+  }
+
   function list(opts, fn) {
-    var q = opts && opts.find ? opts.find : { };
-    return ctx.store.limit.call(api().find(q).sort({created_at: -1}), opts).toArray(fn);
+    with_collection(function (err, collection) {
+      // these functions, find, sort, and limit, are used to
+      // dynamically configure the request, based on the options we've
+      // been given
+
+      // determine sort options
+      function sort ( ) {
+        return opts && opts.sort || {created_at: -1};
+      }
+
+      // configure the limit portion of the current query
+      function limit ( ) {
+        if (opts && opts.count) {
+          return this.limit(parseInt(opts.count));
+        }
+        return this;
+      }
+
+      // handle all the results
+      function toArray (err, entries) {
+        fn(err, entries);
+      }
+
+      // now just stitch them all together
+      limit.call(collection
+          .find(query_for(opts))
+          .sort(sort( ))
+      ).toArray(toArray);
+    });
+  }
+
+  function remove (_id, fn) {
+    var filter;
+    if (_id === '*') {
+      filter = {};
+    } else {
+      filter = { '_id': new ObjectID(_id) };
+    }
+    return api( ).remove(filter, fn);
   }
 
   function api() {
@@ -33,8 +79,13 @@ function storage (collection, ctx) {
   api.list = list;
   api.create = create;
   api.last = last;
+  api.remove = remove;
   api.indexedFields = ['created_at'];
   return api;
 }
 
+storage.queryOpts = {
+  dateField: 'created_at'
+};
+
 module.exports = storage;
diff --git a/lib/language.js b/lib/language.js
index d03a5544670..f0480b253b1 100644
--- a/lib/language.js
+++ b/lib/language.js
@@ -9,7 +9,7 @@ function init() {
 
   language.languages = [
     { code: 'bg', language: 'Български' }
-    , { code: 'cz', language: 'Čeština' }
+    , { code: 'cs', language: 'Čeština' }
     , { code: 'dk', language: 'Dansk' }
     , { code: 'de', language: 'Deutsch' }
     , { code: 'en', language: 'English' }
@@ -104,7 +104,7 @@ function init() {
       ,it: 'Gio'
       ,dk: 'Tor'
       ,fi: 'To'
-      ,no: 'Tor'
+      ,nb: 'Tor'
       ,he: 'ה'
       }
     ,'Fr' : {
@@ -561,7 +561,7 @@ function init() {
       ,fr: 'Supérieur'
       ,pt: 'Superior'
       ,ro: 'Sus'
-      ,bg: 'горе'
+      ,bg: 'горна'
       ,hr: 'Gornja'
       ,sv: 'Toppen'
       ,it: 'Superiore'
@@ -763,7 +763,7 @@ function init() {
       ,he: 'גודל'
       }
     ,'(none)' : {
-      cs: '(Prázdný)'
+      cs: '(Žádný)'
       ,de: '(nichts)'
       ,es: '(ninguno)'
       ,fr: '(aucun)'
@@ -778,6 +778,22 @@ function init() {
       ,nb: '(ingen)'
       ,he: '(ללא)'
       }
+    ,'<none>' : {
+      cs: '<Žádný>'
+      ,de: '<nichts>'
+      ,es: '<ninguno>'
+      ,fr: '<aucun>'
+      ,pt: '<nenhum>'
+      ,sv: '<tom>'
+      ,ro: '<fără>'
+      ,bg: '<няма>'
+      ,hr: '<Prazno>'
+      ,it: '<Nessuno>'
+      ,dk: '<ingen>'
+      ,fi: '<tyhjä>'
+      ,nb: '<ingen>'
+      ,he: '<ללא>'
+      }
     ,'Result is empty' : {
       cs: 'Prázdný výsledek'
       ,de: 'Leeres Ergebnis'
@@ -1234,7 +1250,7 @@ function init() {
       ,ro: 'nr. de valori'
       ,bg: '№ от измервания'
       ,hr: 'broj očitanja'
-      ,it: '# di valori'
+      ,it: 'N° di valori'
       ,dk: 'Antal af aflæsninger'
       ,fi: 'Lukemien määrä'
       ,nb: 'Antall avlesninger'
@@ -1250,7 +1266,7 @@ function init() {
       ,ro: 'Medie'
       ,bg: 'Средна стойност'
       ,hr: 'Prosjek'
-      ,it: 'Medio'
+      ,it: 'Media'
       ,dk: 'Gennemsnit'
       ,fi: 'Keskiarvo'
       ,nb: 'Gjennomsnitt'
@@ -1314,7 +1330,7 @@ function init() {
       ,bg: 'Очакван HbA1c'
       ,hr: 'Procjena HbA1c-a'
       ,sv: 'Beräknat A1c-värde '
-      ,it: 'stima A1c'
+      ,it: 'Stima A1c'
       ,dk: 'Beregnet A1c-værdi '
       ,fi: 'A1c arvio*'
       ,nb: 'Beregnet HbA1c'
@@ -1377,7 +1393,7 @@ function init() {
       ,bg: 'Няма запаметена API парола. Tрябва да въведете API парола'
       ,hr: 'Nema pohranjenog API tajnog hasha. Unesite tajni API'
       ,sv: 'Hemlig api-nyckel saknas. Du måste ange API hemlighet'
-      ,it: 'No API hash segreto ancora memorizzato. È necessario inserire API segreto.'
+      ,it: 'API hash segreto non è ancora memorizzato. È necessario inserire API segreto.'
       ,dk: 'Mangler API-nøgle. Du skal indtaste API hemmelighed'
       ,fi: 'Salainen API-tarkiste puuttuu. Syötä API tarkiste.'
       ,nb: 'Mangler API nøkkel. Du må skrive inn API hemmelighet.'
@@ -1597,7 +1613,7 @@ function init() {
       ,bg: 'Некоректна API парола'
       ,hr: 'Neispravan tajni API'
       ,sv: 'Felaktig API-nyckel'
-      ,it: 'API secreto incorretto'
+      ,it: 'API secreto non corretto'
       ,dk: 'Forkert API-nøgle'
       ,fi: 'Väärä API-avain'
       ,nb: 'Ugyldig API nøkkel'
@@ -1863,7 +1879,7 @@ function init() {
       ,ro: 'Glicemie'
       ,bg: 'Кръвна захар'
       ,hr: 'GUK'
-      ,it: 'Glicemia'
+      ,it: 'Glicemie'
       ,dk: 'Glukoseværdi'
       ,fi: 'Verensokeri'
       ,nb: 'Blodsukker'
@@ -1959,7 +1975,7 @@ function init() {
       ,bg: 'Моля проверете, че датата е въведена правилно'
       ,hr: 'Molim Vas provjerite jesu li uneseni podaci ispravni'
       ,sv: 'Vänligen verifiera att inlagd data är korrekt'
-      ,it: 'Si prega di verificare che i dati inseriti sono corretti'
+      ,it: 'Si prega di verificare che i dati inseriti siano corretti'
       ,dk: 'Venligst verificer at indtastet data er korrekt'
       ,fi: 'Varmista, että tiedot ovat oikein'
       ,nb: 'Vennligst verifiser at inntastet data er korrekt'
@@ -1975,7 +1991,7 @@ function init() {
       ,ro: 'Glicemie'
       ,bg: 'КЗ'
       ,hr: 'GUK'
-      ,it: 'Glicemia'
+      ,it: 'Glicemie'
       ,dk: 'BS'
       ,fi: 'VS'
       ,nb: 'BS'
@@ -1990,7 +2006,7 @@ function init() {
       ,bg: 'Използвай корекцията за КЗ в изчислението'
       ,hr: 'Koristi korekciju GUK-a u izračunu'
       ,sv: 'Använd BS-korrektion för beräkning'
-      ,it: 'Utilizzare la correzione Glicemia nei calcoli'
+      ,it: 'Utilizzare la correzione nei calcoli delle Glicemie'
       ,dk: 'Anvend BS-korrektion før beregning'
       ,fi: 'Käytä korjausannosta laskentaan'
       ,nb: 'Bruk blodsukkerkorrigering i beregning'
@@ -2078,7 +2094,7 @@ function init() {
       ,fr: 'Ajouter à partir de la base de données'
       ,pt: 'Adicionar do banco de dados'
       ,ro: 'Adaugă din baza de date'
-      ,bg: 'Добави към базата с данни'
+      ,bg: 'Добави от базата с данни'
       ,hr: 'Dodaj iz baze podataka'
       ,sv: 'Lägg till från databas'
       ,it: 'Aggiungi dal database'
@@ -2097,7 +2113,7 @@ function init() {
       ,bg: 'Включи корекцията чрез ВХ в изчислението'
       ,hr: 'Koristi korekciju za UH u izračunu'
       ,sv: 'Använd kolhydratkorrektion för beräkning'
-      ,it: 'Utilizzare la correzione con carboidrati nel calcolo'
+      ,it: 'Utilizzare la correzione dei carboidrati nel calcolo'
       ,dk: 'Benyt kulhydratkorrektion i beregning'
       ,fi: 'Käytä hiilihydraattikorjausta laskennassa'
       ,nb: 'Bruk karbohydratkorrigering i beregning'
@@ -2306,7 +2322,7 @@ function init() {
       ,fr: '15 min avant'
       ,pt: '15 min antes'
       ,sv: '15 min tidigare'
-      ,ro: 'acu 15 min'
+      ,ro: 'acum 15 min'
       ,bg: 'Преди 15 минути'
       ,hr: 'Prije 15 minuta'
       ,it: '15 minuti prima'
@@ -2451,7 +2467,7 @@ function init() {
       ,ro: 'Acum'
       ,bg: 'Сега'
       ,hr: 'Sad'
-      ,it: 'Adesso'
+      ,it: 'Ora'
       ,dk: 'Nu'
       ,fi: 'Nyt'
       ,nb: 'Nå'
@@ -2483,7 +2499,7 @@ function init() {
       ,ro: 'Trimite formularul'
       ,bg: 'Въвеждане на данните'
       ,hr: 'Predaj obrazac'
-      ,it: 'Inviare il modulo'
+      ,it: 'Invia il modulo'
       ,dk: 'Gem hændelsen'
       ,fi: 'Lähetä tiedot'
       ,nb: 'Lagre'
@@ -2499,7 +2515,7 @@ function init() {
       ,ro: 'Editare profil'
       ,bg: 'Редактор на профила'
       ,hr: 'Editor profila'
-      ,it: 'Editor dei profili'
+      ,it: 'NS - Dati personali'
       ,dk: 'Profil editor'
       ,fi: 'Profiilin muokkaus'
       ,nb: 'Profileditor'
@@ -2515,7 +2531,7 @@ function init() {
       ,ro: 'Instrument de rapoarte'
       ,bg: 'Статистика'
       ,hr: 'Alat za prijavu'
-      ,it: 'Strumento di reporting'
+      ,it: 'NS - Statistiche'
       ,dk: 'Rapporteringsværktøj'
       ,fi: 'Raportointityökalu'
       ,nb: 'Rapporteringsverktøy'
@@ -2575,7 +2591,7 @@ function init() {
       ,ro: 'Neautorizat'
       ,bg: 'Неразрешен достъп'
       ,hr: 'Neautorizirano'
-      ,it: 'non autorizzato'
+      ,it: 'Non Autorizzato'
       ,dk: 'Uautoriseret'
       ,fi: 'Kielletty'
       ,nb: 'Uautorisert'
@@ -2780,6 +2796,10 @@ function init() {
       ,nb: 'Logaritmisk'
       ,he: 'לוגריתמי'
       }
+    ,'Logarithmic (Dynamic)' : { 
+      it: 'Logaritmica (Dinamica)'
+      ,ro: 'Logaritmic (Dinamic)'
+      }
     ,'Silence for 30 minutes' : {
       cs: 'Ztlumit na 30 minut'
       ,de: 'Ausschalten für 30 Minuten'
@@ -2850,7 +2870,7 @@ function init() {
       ,ro: '3h'
       ,bg: '3часа'
       ,hr: '3h'
-      ,it: '3h'
+      ,it: '3ORE'
       ,dk: '3tim'
       ,fi: '3h'
       ,nb: '3t'
@@ -2865,7 +2885,7 @@ function init() {
       ,ro: '6h'
       ,bg: '6часа'
       ,hr: '6h'
-      ,it: '6h'
+      ,it: '6ORE'
       ,dk: '6tim'
       ,fi: '6h'
       ,nb: '6t'
@@ -2880,7 +2900,7 @@ function init() {
       ,ro: '12h'
       ,bg: '12часа'
       ,hr: '12h'
-      ,it: '12h'
+      ,it: '12ORE'
       ,dk: '12tim'
       ,fi: '12h'
       ,nb: '12t'
@@ -2895,7 +2915,7 @@ function init() {
       ,ro: '24h'
       ,bg: '24часа'
       ,hr: '24h'
-      ,it: '24h'
+      ,it: '24ORE'
       ,dk: '24tim'
       ,fi: '24h'
       ,nb: '24t'
@@ -2943,7 +2963,7 @@ function init() {
       ,it: 'Formato data'
       ,dk: 'dato format'
       ,fi: 'Aikamuoto'
-      ,nb: 'datoformat'
+      ,nb: 'Datoformat'
       }
     ,'12 hours' : {
       cs: '12 hodin'
@@ -3017,7 +3037,7 @@ function init() {
       ,bg: 'Болус-основно хранене'
       ,hr: 'Bolus za obrok'
       ,sv: 'Måltidsbolus'
-      ,it: 'bolo pasto'
+      ,it: 'Bolo Pasto'
       ,dk: 'Måltidsbolus'
       ,fi: 'Ruokailubolus'
       ,nb: 'Måltidsbolus'
@@ -3033,7 +3053,7 @@ function init() {
       ,ro: 'Bolus gustare'
       ,bg: 'Болус-лека закуска'
       ,hr: 'Bolus za užinu'
-      ,it: 'Bolo merenda'
+      ,it: 'Bolo Merenda'
       ,dk: 'Mellemmåltidsbolus'
       ,fi: 'Ruokakorjaus'
       ,nb: 'Mellommåltidsbolus'
@@ -3049,7 +3069,7 @@ function init() {
       ,bg: 'Болус корекция'
       ,hr: 'Korekcija'
       ,sv: 'Korrektionsbolus'
-      ,it: 'Correzione bolo'
+      ,it: 'Bolo Correttivo'
       ,dk: 'Korrektionsbolus'
       ,fi: 'Korjausbolus'
       ,nb: 'Korreksjonsbolus'
@@ -3065,7 +3085,7 @@ function init() {
       ,bg: 'Корекция чрез въглехидрати'
       ,hr: 'Bolus za hranu'
       ,sv: 'Kolhydratskorrektion'
-      ,it: 'Correzione carboidrati'
+      ,it: 'Carboidrati Correttivi'
       ,dk: 'Kulhydratskorrektion'
       ,fi: 'Hiilihydraattikorjaus'
       ,nb: 'Karbohydratkorrigering'
@@ -3103,12 +3123,6 @@ function init() {
       ,nb: 'Spørsmål'
       ,he: 'שאלה'
      }
-    ,'Announcement' : {
-      bg: 'Известяване'
-      , fi: 'Tiedoitus'
-      ,pt: 'Aviso'
-      ,he: 'הודעה'
-      }
     ,'Exercise' : {
       cs: 'Cvičení'
       ,de: 'Bewegung'
@@ -3119,7 +3133,7 @@ function init() {
       ,ro: 'Activitate fizică'
       ,bg: 'Спорт'
       ,hr: 'Aktivnost'
-      ,it: 'Esercizio'
+      ,it: 'Esercizio Fisico'
       ,dk: 'Træning'
       ,fi: 'Fyysinen harjoitus'
       ,nb: 'Trening'
@@ -3135,7 +3149,7 @@ function init() {
       ,ro: 'Schimbare loc pompă'
       ,bg: 'Смяна на сет'
       ,hr: 'Promjena seta'
-      ,it: 'Cambio Ago'
+      ,it: '(CAGE) Cambio Ago'
       ,dk: 'Skift insulin infusionssted'
       ,fi: 'Pumpun kanyylin vaihto'
       ,nb: 'Pumpebytte'
@@ -3181,7 +3195,7 @@ function init() {
       ,pt: 'Início de sensor'
       ,sv: 'Dexcom sensorstart'
       ,ro: 'Pornire senzor Dexcom'
-      ,bg: 'Поставяне на Декском сензор'
+      ,bg: 'Стартиране на Декском сензор'
       ,hr: 'Start Dexcom senzora'
       ,it: 'Avvio sensore Dexcom'
       ,dk: 'Dexcom sensor start'
@@ -3231,7 +3245,7 @@ function init() {
       ,ro: 'Alertă câine de serviciu'
       ,bg: 'Сигнал от обучено куче'
       ,hr: 'Obavijest dijabetičkog psa'
-      ,it: 'Allarme D.A.D.'
+      ,it: 'Allarme D.A.D.(Diabete Alert Dog)'
       ,dk: 'Vuf Vuf! (Diabeteshundealarm!)'
       ,fi: 'Diabeteskoirahälytys'
       ,nb: 'Diabeteshundalarm'
@@ -3391,7 +3405,7 @@ function init() {
       ,ro: 'Alarmă urgentă hiper'
       ,bg: 'Много висока КЗ'
       ,hr: 'Hitni alarm za hiper'
-      ,it: 'Allarme Urgente: Glicemia Molto Alta'
+      ,it: 'Urgente:Glicemia Alta'
       ,dk: 'Høj grænse overskredet'
       ,fi: 'Kriittinen korkea'
       ,nb: 'Kritisk høy alarm'
@@ -3404,10 +3418,10 @@ function init() {
       ,fr: 'Alarme haute'
       ,pt: 'Alarme de glicemia alta'
       ,sv: 'Högt larmvärde'
-      ,ro:  'Alarmă hiper'
+      ,ro: 'Alarmă hiper'
       ,bg: 'Висока КЗ'
       ,hr: 'Alarm za hiper'
-      ,it: 'Allarme: Glicemia Alta'
+      ,it: 'Glicemia Alta'
       ,dk: 'Høj grænse overskredet'
       ,fi: 'Korkea verensokeri'
       ,nb: 'Høy alarm'
@@ -3423,7 +3437,7 @@ function init() {
       ,ro: 'Alarmă hipo'
       ,bg: 'Ниска КЗ'
       ,hr: 'Alarm za hipo'
-      ,it: 'Allarme Glicemia bassa'
+      ,it: 'Glicemia bassa'
       ,dk: 'Lav grænse overskredet'
       ,fi: 'Matala verensokeri'
       ,nb: 'Lav alarm'
@@ -3439,7 +3453,7 @@ function init() {
       ,ro: 'Alarmă urgentă hipo'
       ,bg: 'Много ниска КЗ'
       ,hr: 'Hitni alarm za hipo'
-      ,it: 'Allarme Urgente. Glicemia Molto Bassa'
+      ,it: 'Urgente:Glicemia Bassa'
       ,dk: 'Advarsel: Lav'
       ,fi: 'Kriittinen matala'
       ,nb: 'Kritisk lav alarm'
@@ -3455,7 +3469,7 @@ function init() {
       ,ro: 'Date învechite: alertă'
       ,bg: 'Стари данни'
       ,hr: 'Pažnja: Stari podaci'
-      ,it: 'Dati obsoleti: Notifica'
+      ,it: 'Notifica Dati'
       ,dk: 'Advarsel: Gamle data'
       ,fi: 'Vanhat tiedot: varoitus'
       ,nb: 'Advarsel: Gamle data'
@@ -3470,7 +3484,7 @@ function init() {
       ,ro: 'Date învechite: urgent'
       ,bg: 'Много стари данни'
       ,hr: 'Hitno: Stari podaci'
-      ,it: 'Dati obsoleti: Urgente'
+      ,it: 'Notifica:Urgente'
       ,dk: 'Advarsel: Gamle data'
       ,fi: 'Vanhat tiedot: hälytys'
       ,nb: 'Advarsel: Veldig gamle data'
@@ -3500,7 +3514,7 @@ function init() {
       ,ro: 'Mod nocturn'
       ,bg: 'Нощен режим'
       ,hr: 'Noćni način'
-      ,it: 'Modalità notte'
+      ,it: 'Modalità Notte'
       ,dk: 'Nat mode'
       ,fi: 'Yömoodi'
       ,nb: 'Nattmodus'
@@ -3515,7 +3529,7 @@ function init() {
       ,ro: 'La activare va scădea iluminarea între 22 și 6'
       ,bg: 'Когато е активирано, страницата ще е затъмнена от 22-06ч'
       ,hr: 'Kad je uključen, stranica će biti zatamnjena od 22-06'
-      ,it: 'Attivandola, la pagina sarà oscurato da 10:00-06:00.'
+      ,it: 'Attivandola, la pagina sarà oscurata dalle 22:00-06:00.'
       ,dk: 'Når aktiveret vil denne side nedtones fra 22:00-6:00'
       ,fi: 'Aktivoituna sivu himmenee kello 22 ja 06 välillä'
       ,nb: 'Når aktivert vil denne siden nedtones fra 22:00-06:00'
@@ -3680,7 +3694,7 @@ function init() {
       ,ro: 'Resetează și folosește setările implicite'
       ,bg: 'Нулирай и използвай стандартните настройки'
       ,hr: 'Resetiraj i koristi defaultne vrijednosti'
-      ,it: 'Resetta e utilizza le impostazioni predefinite'
+      ,it: 'Resetta le impostazioni predefinite'
       ,dk: 'Returner til standardopsætning'
       ,fi: 'Palauta oletusasetukset'
       ,nb: 'Gjenopprett standardinnstillinger'
@@ -3723,9 +3737,9 @@ function init() {
       ,pt: 'Calculadora de bolus'
       ,sv: 'Boluskalkylator'
       ,ro: 'Calculator sugestie bolus'
-      ,bg: 'Съветник при изчисление на болуса'
+      ,bg: 'Болус съветник '
       ,hr: 'Bolus wizard'
-      ,it: 'Bolo guidato'
+      ,it: 'Calcolatore di Bolo'
       ,dk: 'Bolusberegner'
       ,fi: 'Annosopas'
       ,nb: 'Boluskalkulator'
@@ -4051,6 +4065,7 @@ function init() {
       ,es: 'Momento de la ingesta'
       ,fr: 'Moment de Glucide'
       ,pt: 'Hora do carboidrato'
+      ,ro: 'Ora carbohidrați'
       ,bg: 'Ядене след'
       ,hr: 'Vrijeme unosa UH'
       ,sv: 'Kolhydratstid'
@@ -4062,35 +4077,311 @@ function init() {
       }
     ,'Language' : {
       cs: 'Jazyk'
+      ,sv: 'Språk'
+      ,nb: 'Språk'
       ,fi: 'Kieli'
       ,pt: 'Língua'
+      ,ro: 'Limba'
       ,bg: 'Език'
+      ,it: 'Lingua'
       }
     ,'Update' : { // Update button
       cs: 'Aktualizovat'
+      ,sv: 'Uppdatera'
+      ,nb: 'Oppdater'
       ,pt: 'Atualizar'
+      ,ro: 'Actualizare'
       ,bg: 'Актуализирай'
+      ,it: 'Aggiornamento'
       }
     ,'Order' : {
       cs: 'Pořadí'
+      ,sv: 'Sortering'
+      ,nb: 'Sortering'
+      ,ro: 'Sortare'
       ,bg: 'Ред'
+      ,it: 'Ordina'
       }
     ,'oldest on top' : {
       cs: 'nejstarší nahoře'
+      ,sv: 'Äldst först'
+      ,nb: 'Eldste først'
+      ,ro: 'mai vechi primele'
       ,bg: 'Старите най-отгоре'
+      ,it: 'più vecchio in alto'
       }
     ,'newest on top' : {
       cs: 'nejnovější nahoře'
+      ,sv: 'Nyast först'
+      ,nb: 'Nyeste først'
+      ,ro: 'mai noi primele'
       ,bg: 'Новите най-отгоре'
+      ,it: 'più recente in alto'
+      }
+    ,'All sensor events' : {
+      cs: 'Všechny události sensoru'
+      ,nb: 'Alle sensorhendelser'
+      ,ro: 'Evenimente legate de senzor'
+      ,bg: 'Всички събития от сензора'
+      ,it: 'Tutti gli eventi del sensore'
+      }
+    ,'Remove future items from mongo database' : {
+      cs: 'Odebrání položek v budoucnosti z Mongo databáze'
+      ,nb: 'Fjern fremtidige elementer fra mongo database'
+      ,ro: 'Șterge date din viitor din baza de date mongo'
+      ,bg: 'Премахни бъдещите точки от Монго базата с данни'
+      ,it: 'Rimuovere gli oggetti dal database di mongo (prossimamente)'
+      }
+    ,'Find and remove treatments in the future' : {
+      cs: 'Najít a odstranit záznamy ošetření v budoucnosti'
+      ,nb: 'Finn og fjern fremtidige behandlinger'
+      ,ro: 'Caută și elimină tratamente din viiotr'
+      ,bg: 'Намери и премахни събития в бъдещето'
+      ,it: 'Individuare e rimuovere le somministrazioni (prossimamente)'
+      }
+    ,'This task find and remove treatments in the future.' : {
+      cs: 'Tento úkol najde a odstraní ošetření v budoucnosti.'
+      ,nb: 'Finn og fjern fremtidige behandlinger'
+      ,ro: 'Acest instrument curăță tratamentele din viitor.'
+      ,bg: 'Тази опция намира и премахва събития в бъдещето.'
+      ,it: 'Trovare e rimuovere le somministrazioni (prossimamente)'
+      }
+    ,'Remove treatments in the future' : {
+      cs: 'Odstraň ošetření v budoucnosti'
+      ,nb: 'Fjern fremtidige behandlinger'
+      ,ro: 'Șterge tratamentele din viitor'
+      ,bg: 'Премахни събитията в бъдешето'
+      ,it: 'Rimuovere somministrazioni (prossimamente)'
+      }
+    ,'Find and remove entries in the future' : {
+      cs: 'Najít a odstranit CGM data v budoucnosti'
+      ,nb: 'Finn og fjern fremtidige hendelser'
+      ,bg: 'Намери и премахни данни от сензора в бъдещето'
+      ,ro: 'Caută și elimină valorile din viitor'
+      ,it: 'Trovare e rimuovere le voci (prossimamente)'
+      }
+    ,'This task find and remove CGM data in the future created by uploader with wrong date/time.' : {
+      cs: 'Tento úkol najde a odstraní CGM data v budoucnosti vzniklé špatně nastaveným datem v uploaderu.'
+      ,nb: 'Finn og fjern fremtidige cgm data lastet opp med feil dato/tid'
+      ,bg: 'Тази опция ще намери и премахне данни от сензора в бъдещето, създадени поради грешна дата/време.'
+      ,ro: 'Instrument de căutare și eliminare a datelor din viitor, create de uploader cu ora setată greșit'
+      ,it: 'Trovare e rimuovere i dati CGM creato da uploader/xdrip con data / ora sbagliato (prossimamente)'
+      }
+    ,'Remove entries in the future' : {
+      cs: 'Odstraň CGM data v budoucnosti'
+      ,nb: 'Fjern fremtidige hendelser'
+      ,bg: 'Премахни данните от сензора в бъдещето'
+      ,ro: 'Elimină înregistrările din viitor'
+      ,it: 'Rimuovere le voci (prossimamente)'
+      }
+    ,'Loading database ...' : {
+      cs: 'Nahrávám databázi ...'
+      ,nb: 'Leser database ...'
+      ,bg: 'Зареждане на базата с данни ...'
+      ,ro: 'Încarc baza de date'
+      ,it: 'Caricamento Database ...'
+      }
+    ,'Database contains %1 future records' : {
+      cs: 'Databáze obsahuje %1 záznamů v budoucnosti'
+      ,nb: 'Databasen inneholder %1 fremtidige hendelser'
+      ,ro: 'Baza de date conține %1 înregistrări din viitor'
+      ,bg: 'Базата с дани съдържа %1 бъдещи записи'
+      ,it: 'Contiene Database %1 record (prossimamente)'
+      }
+    ,'Remove %1 selected records?' : {
+      cs: 'Odstranit %1 vybraných záznamů'
+      ,nb: 'Fjern %1 valgte elementer?'
+      ,ro: 'Șterg %1 înregistrări selectate?'
+      ,bg: 'Премахване на %1 от избраните записи?'
+      ,it: 'Rimuovere %1 record selezionati?'
+      }
+    ,'Error loading database' : {
+      cs: 'Chyba při nahrávání databáze'
+      ,nb: 'Feil udner lasting av database'
+      ,ro: 'Eroare la încărcarea bazei de date'
+      ,bg: 'Грешка при зареждане на базата с данни'
+      ,it: 'Errore di caricamento del database'
+      }
+    ,'Record %1 removed ...' : {
+      cs: 'Záznam %1 odstraněn ...'
+      ,nb: 'Element %1 fjernet'
+      ,ro: 'Înregistrarea %1 a fost ștearsă...'
+      ,bg: '%1 записи премахнати'
+      ,it: 'Record %1 rimosso ...'
+      }
+    ,'Error removing record %1' : {
+      cs: 'Chyba při odstaňování záznamu %1'
+      ,nb: 'Feil under fjerning av element %1'
+      ,ro: 'Eroare la ștergerea înregistrării %1'
+      ,bg: 'Грешка при премахването на %1 от записите'
+      ,it: 'Errore rimozione record %1'
+      }
+    ,'Deleting records ...' : {
+      cs: 'Odstraňování záznamů ...'
+      ,nb: 'Fjerner elementer...'
+      ,ro: 'Se șterg înregistrările...'
+      ,bg: 'Изтриване на записите...'
+      ,it: 'Eliminazione dei record ...'
+      }
+    ,'Clean Mongo status database' : {
+      cs: 'Vyčištění Mongo databáze statusů'
+      ,nb: 'Slett Mongo status database'
+      ,ro: 'Curăță tabela despre status din Mongo'
+      ,bg: 'Изчисти статуса на Монго базата с данни'
+      ,it: 'Pulire database di Mongo'
+      }
+    ,'Delete all documents from devicestatus collection' : {
+      cs: 'Odstranění všech záznamů z kolekce devicestatus'
+      ,nb: 'Fjern alle dokumenter fra device status tabell'
+      ,ro: 'Șterge toate documentele din colecția de status dispozitiv'
+      ,bg: 'Изтрий всички документи от папката статус-устройство'
+      ,it: 'Eliminare tutti i documenti dalla collezione "devicestatus"'
+      }
+    ,'This task removes all documents from devicestatus collection. Useful when uploader battery status is not properly updated.' : {
+      cs: 'Tento úkol odstraní všechny dokumenty z kolekce devicestatus. Je to vhodné udělat, pokud se ukazatel stavu baterie neobnovuje správně.'
+      ,nb: 'Denne funksjonen fjerner alle dokumenter fra device status tabellen.  Nyttig når status for opplaster batteri ikke blir opppdatert'
+      ,ro: 'Acest instrument șterge toate documentele din colecția devicestatus. Se folosește când încărcarea bateriei nu se afișează corect.'
+      ,bg: 'Тази опция премахва всички документи от папката статус-устройство. Полезно е, когато статусът на батерията не се обновява.'
+      ,it: 'Questa attività elimina tutti i documenti dalla collezione "devicestatus". Utile quando lo stato della batteria uploader/xdrip non si aggiorna.'
+      }
+    ,'Delete all documents' : {
+      cs: 'Odstranit všechny dokumenty'
+      ,nb: 'Fjern alle dokumenter'
+      ,ro: 'Șterge toate documentele'
+      ,bg: 'Изтрий всички документи'
+      ,it: 'Eliminare tutti i documenti'
+      }
+    ,'Delete all documents from devicestatus collection?' : {
+      cs: 'Odstranit všechny dokumenty z kolekce devicestatus?'
+      ,nb: 'Fjern alle dokumenter fra device status tabellen?'
+      ,ro: 'Șterg toate documentele din colecția devicestatus?'
+      ,bg: 'Изтриване на всички документи от папката статус-устройство?'
+      ,it: 'Eliminare tutti i documenti dalla collezione devicestatus?'
+      }
+    ,'Database contains %1 records' : {
+      cs: 'Databáze obsahuje %1 záznamů'
+      ,nb: 'Databasen inneholder %1 elementer'
+      ,ro: 'Baza de date conține %1 înregistrări'
+      ,bg: 'Базата с данни съдържа %1 записи'
+      ,it: 'Contiene Database record%1'
+      }
+    ,'All records removed ...' : {
+      cs: 'Všechny záznamy odstraněny ...'
+      ,nb: 'Alle elementer fjernet ...'
+      ,ro: 'Toate înregistrările au fost șterse.'
+      ,bg: 'Всички записи премахнати ...'
+      ,it: 'Tutti i record rimossi ...'
+      }
+    ,'Admin Tools' : {
+      cs: 'Nástroje pro správu'
+      ,nb: 'Administrasjonsoppgaver'
+      ,ro: 'Instrumente de administrare'
+      ,bg: 'Настройки на администратора'
+      ,it: 'NS - Dati Mongo' 
+      }
+    ,'Nightscout reporting' : {
+      cs: 'Nightscout - Výkazy'
+      ,nb: 'Nightscout - rapporter'
+      ,ro: 'Rapoarte Nightscout'
+      ,bg: 'Найтскаут статистика'
+      ,it: 'Nightscout - Statistiche'
+      }
+    ,'Cancel' : {
+      cs: 'Zrušit'
+      ,nb: 'Avbryt'
+      ,ro: 'Renunță'
+      ,bg: 'Откажи'
+      ,it: 'Cancellare'
+      }
+    ,'Edit treatment' : {
+      cs: 'Upravit ošetření'
+      ,nb: 'Editer behandling'
+      ,ro: 'Modifică înregistrarea'
+      ,bg: 'Редакция на събитие'
+      ,it: 'Modifica Somministrazione'
+      }
+    ,'Duration' : {
+      cs: 'Doba trvání'
+      ,ro: 'Durata'
+      ,bg: 'Времетраене'
+      ,it: 'Tempo'
       }
-
+    ,'Duration in minutes' : {
+      cs: 'Doba trvání v minutách'
+      ,ro: 'Durata în minute'
+      ,bg: 'Времетраене в мин.'
+      ,it: 'Tempo in minuti'
+      }
+    ,'Temp Basal' : {
+      cs: 'Dočasný bazál'
+      ,ro: 'Bazală temporară'
+      ,bg: 'Временен базал'
+      ,it: 'Basale Temp'
+      }
+    ,'Temp Basal Start' : {
+      cs: 'Dočasný bazál začátek'
+      ,ro: 'Start bazală temporară'
+      ,bg: 'Начало на временен базал'
+      ,it: 'Inizio Basale Temp'
+      }
+    ,'Temp Basal End' : {
+      cs: 'Dočasný bazál konec'
+      ,ro: 'Sfârșit bazală temporară'
+      ,bg: 'Край на временен базал'
+      ,it: 'Fine Basale Temp'
+      }
+    ,'Percent' : { // value in % for temp basal
+      cs: 'Procenta'
+      ,ro: 'Procent'
+      ,bg: 'Процент'
+      ,it: 'Percentuale'
+      }
+    ,'Basal change in %' : {
+      cs: 'Změna bazálu v %'
+      ,ro: 'Bazală schimbată în %'
+      ,bg: 'Промяна на базала с %'
+      ,it: 'Variazione basale in %'
+      }
+    ,'Basal value' : { // absolute value for temp basal
+      cs: 'Hodnota bazálu'
+      ,ro: 'Valoare bazală'
+      ,bg: 'Временен базал'
+      ,it: 'Valore Basale temp'
+      }
+    ,'Absolute basal value' : {
+      cs: 'Hodnota bazálu'
+      ,bg: 'Базална стойност'
+      ,it: 'Valore Basale'
+      }
+    ,'Announcement' : {
+      cs: 'Oznámení'
+      ,bg: 'Известяване'
+      ,fi: 'Tiedoitus'
+      ,pt: 'Aviso'
+      ,ro: 'Anunț'
+      ,he: 'הודעה'
+      ,it: 'Annuncio'
+      }
+    ,'Loading temp basal data' : {		
+      cs: 'Nahrávám dočasné bazály'
+      ,it: 'Caricamento basale temporanea'
+      ,ro: 'Se încarcă date bazală temporară'
+      }
+ 
   };
 
-  language.translate = function translate(text) {
+  language.translate = function translate(text, options) {
+    var translated = text;
     if (translations[text] && translations[text][lang]) {
-      return translations[text][lang];
+      translated = translations[text][lang];
+    }
+    if (options && options.params) {
+      for (var i = 0; i < options.params.length; i++) {
+        var r = new RegExp('\%' + (i+1), 'g');
+        translated = translated.replace(r, options.params[i]);
+      }
     }
-    return text;
+    return translated;
   };
 
   language.DOMtranslate = function DOMtranslate($) {
diff --git a/lib/middleware/index.js b/lib/middleware/index.js
index 29255958a4c..8cdcb1b18b2 100644
--- a/lib/middleware/index.js
+++ b/lib/middleware/index.js
@@ -3,7 +3,8 @@
 var wares = {
   verifyAuthorization : require('./verify-token'),
   sendJSONStatus : require('./send-json-status'),
-  bodyParser : require('body-parser')
+  bodyParser : require('body-parser'),
+  compression : require('compression')
 };
 
 function extensions (list) {
@@ -15,6 +16,7 @@ function configure (env) {
     verifyAuthorization: wares.verifyAuthorization(env),
     sendJSONStatus: wares.sendJSONStatus( ),
     bodyParser: wares.bodyParser,
+    compression: wares.compression,
     extensions: extensions
   };
 }
diff --git a/lib/plugins/boluswizardpreview.js b/lib/plugins/boluswizardpreview.js
index bcc30611dd7..fd7d012d2d1 100644
--- a/lib/plugins/boluswizardpreview.js
+++ b/lib/plugins/boluswizardpreview.js
@@ -253,20 +253,28 @@ function pushInfo(prop, info, sbx) {
 
 function pushTempBasalAdjustments(prop, info, sbx) {
   if (prop && prop.tempBasalAdjustment) {
-    var carbsOrBolusMessage = 'too large adjustment needed, give carbs?';
+    var carbsOrBolusMessage = 'basal adjustment out of range, give carbs?';
     var sign = '';
     if (prop.tempBasalAdjustment.thirtymin > 100) {
-      carbsOrBolusMessage = 'too large adjustment needed, give bolus?';
+      carbsOrBolusMessage = 'basal adjustment out of range, give bolus?';
       sign = '+';
     }
 
     info.push({label: '---------', value: ''});
     if (prop.aimTarget) {
-      info.push({label: 'Projection ' + prop.aimTargetString +' target', value: 'aiming at ' + prop.aimTarget + ' ' + sbx.settings.units});
+      info.push({label: 'Projected BG ' + prop.aimTargetString +' target', value: 'aiming at ' + prop.aimTarget + ' ' + sbx.settings.units});
+    }
+    
+    if (prop.bolusEstimate > 0) {
+      info.push({label: 'Bolus ' + prop.bolusEstimateDisplay + ' units', value: 'or adjust basal'});
+      info.push({label: 'Check BG using glucometer before correcting!', value: ''});
+      info.push({label: '---------', value: ''});
+    } else {
+      info.push({label: 'Basal reduction to account ' + prop.bolusEstimateDisplay + ' units:', value: ''});
     }
-    info.push({label: 'Current basal', value: sbx.data.profile.getBasal(sbx.time)});
-    info.push({label: 'Basal change to account for ' + prop.bolusEstimateDisplay + ':', value: ''});
 
+    info.push({label: 'Current basal', value: sbx.data.profile.getBasal(sbx.time)});
+        
     if (prop.tempBasalAdjustment.thirtymin >= 0 && prop.tempBasalAdjustment.thirtymin <= 200) {
       info.push({label: '30m temp basal', value: '' + prop.tempBasalAdjustment.thirtymin + '% (' + sign + (prop.tempBasalAdjustment.thirtymin - 100) + '%)'});
     } else {
diff --git a/lib/plugins/cob.js b/lib/plugins/cob.js
index 385ac6659bf..aa831f6c8b7 100644
--- a/lib/plugins/cob.js
+++ b/lib/plugins/cob.js
@@ -30,7 +30,8 @@ function init() {
       return {};
     }
 
-    var liverSensRatio = 1;
+    // TODO: figure out the liverSensRatio that gives the most accurate purple line predictions
+    var liverSensRatio = 8;
     var totalCOB = 0;
     var lastCarbs = null;
 
@@ -51,10 +52,12 @@ function init() {
         var cCalc = cob.cobCalc(treatment, profile, lastDecayedBy, time);
         var decaysin_hr = (cCalc.decayedBy - time) / 1000 / 60 / 60;
         if (decaysin_hr > -10) {
+          // units: BG
           var actStart = iob.calcTotal(treatments, profile, lastDecayedBy).activity;
           var actEnd = iob.calcTotal(treatments, profile, cCalc.decayedBy).activity;
           var avgActivity = (actStart + actEnd) / 2;
-          var delayedCarbs = avgActivity * liverSensRatio * profile.getSensitivity(treatment.mills) / profile.getCarbRatio(treatment.mills);
+          // units:  g     =       BG      *      scalar     /          BG / U                           *     g / U
+          var delayedCarbs = ( avgActivity *  liverSensRatio / profile.getSensitivity(treatment.mills) ) * profile.getCarbRatio(treatment.mills);
           var delayMinutes = Math.round(delayedCarbs / profile.getCarbAbsorptionRate(treatment.mills) * 60);
           if (delayMinutes > 0) {
             cCalc.decayedBy.setMinutes(cCalc.decayedBy.getMinutes() + delayMinutes);
diff --git a/lib/plugins/direction.js b/lib/plugins/direction.js
index f3698664fc4..07f9f6e1071 100644
--- a/lib/plugins/direction.js
+++ b/lib/plugins/direction.js
@@ -34,8 +34,8 @@ function init() {
       }
 
       sbx.pluginBase.updatePillText(direction, {
-        label: prop && prop.label
-        , directText: true
+        label: prop && prop.label + '&#xfe0e;'
+        , directHTML: true
       });
     }
   };
diff --git a/lib/plugins/iob.js b/lib/plugins/iob.js
index b4c4bbc518a..4d8f4e7a85a 100644
--- a/lib/plugins/iob.js
+++ b/lib/plugins/iob.js
@@ -38,6 +38,7 @@ function init() {
           lastBolus = treatment;
         }
         if (tIOB && tIOB.iobContrib) { totalIOB += tIOB.iobContrib; }
+        // units: BG (mg/dL or mmol/L)
         if (tIOB && tIOB.activityContrib) { totalActivity += tIOB.activityContrib; }
       }
     });
@@ -76,6 +77,7 @@ function init() {
       if (minAgo < peak) {
         var x1 = minAgo / 5 + 1;
         result.iobContrib = treatment.insulin * (1 - 0.001852 * x1 * x1 + 0.001852 * x1);
+        // units: BG (mg/dL)  = (BG/U) *    U insulin     * scalar
         result.activityContrib = sens * treatment.insulin * (2 / dia / 60 / peak) * minAgo;
 
       } else if (minAgo < 180) {
@@ -113,4 +115,4 @@ function init() {
 
 }
 
-module.exports = init;
\ No newline at end of file
+module.exports = init;
diff --git a/lib/plugins/mmconnect.js b/lib/plugins/mmconnect.js
new file mode 100644
index 00000000000..01d430f9537
--- /dev/null
+++ b/lib/plugins/mmconnect.js
@@ -0,0 +1,115 @@
+/* jshint node: true */
+'use strict';
+
+var _ = require('lodash'),
+  connect = require('minimed-connect-to-nightscout');
+
+function init (env, entries) {
+  if (env.extendedSettings.mmconnect && env.extendedSettings.mmconnect.userName && env.extendedSettings.mmconnect.password) {
+    return {run: makeRunner(env, entries)};
+  } else {
+    console.info('MiniMed Connect not enabled');
+    return null;
+  }
+}
+
+function makeRunner (env, entries) {
+  var options = getOptions(env);
+
+  var client = connect.carelink.Client(options);
+  connect.logger.setVerbose(options.verbose);
+
+  var handleData = makeHandler_(entries, options.sgvLimit, makeRecentSgvFilter(), options.storeRawData);
+
+  return function run () {
+    setInterval(function() {
+      client.fetch(handleData);
+    }, options.interval);
+  };
+}
+
+function getOptions (env) {
+  return {
+    username: env.extendedSettings.mmconnect.userName
+    , password: env.extendedSettings.mmconnect.password
+    , sgvLimit: parseInt(env.extendedSettings.mmconnect.sgvLimit || 24, 10)
+    , interval: parseInt(env.extendedSettings.mmconnect.interval || 60*1000, 10)
+    , maxRetryDuration: parseInt(env.extendedSettings.mmconnect.maxRetryDuration || 32, 10)
+    , verbose: !!env.extendedSettings.mmconnect.verbose
+    , storeRawData: !!env.extendedSettings.mmconnect.storeRawData
+  };
+}
+
+function makeHandler_ (entries, sgvLimit, filter, storeRawData) {
+  return function handleCarelinkData (err, data) {
+    if (err) {
+      console.error('MiniMed Connect error: ' + err);
+    } else {
+      var transformed = connect.transform(data, sgvLimit);
+
+      if (storeRawData && transformed.length) {
+        transformed.push(rawDataEntry(data));
+      }
+
+      // If we blindly upsert the SGV entries, we will lose trend data for
+      // entries we've already stored, since all SGVs from CareLink except
+      // the most recent are missing trend data.
+      var filtered = filter(transformed);
+
+      entries.create(filtered, function afterCreate (err) {
+        if (err) {
+          console.error('MiniMed Connect storage error: ' + err);
+        }
+      });
+    }
+  };
+}
+
+function makeRecentSgvFilter () {
+  var lastSgvDate = 0;
+
+  return function filter (entries) {
+    var out = [];
+
+    entries.forEach(function(entry) {
+      if (entry['type'] !== 'sgv' || entry['date'] > lastSgvDate) {
+        out.push(entry);
+      }
+    });
+
+    out.filter(function(e) { return e['type'] === 'sgv'; })
+      .forEach(function(e) {
+        lastSgvDate = Math.max(lastSgvDate, e['date']);
+      });
+
+    return out;
+  };
+}
+
+function rawDataEntry (data) {
+  var cleansed = _.cloneDeep(data);
+
+  // redact PII
+  cleansed['firstName'] = cleansed['lastName'] = cleansed['medicalDeviceSerialNumber'] = '<redacted>';
+
+  // trim the default 288 sgvs returned by carelink
+  if (cleansed['sgs'] && cleansed['sgs'] instanceof Array) {
+    cleansed['sgs'] = cleansed['sgs'].slice(Math.max(0, cleansed['sgs'].length - 6));
+  }
+
+  var timestamp = data['lastMedicalDeviceDataUpdateServerTime'];
+  return {
+    'date': timestamp
+    , 'dateString': new Date(timestamp).toISOString()
+    , 'type': 'carelink_raw'
+    , 'data': cleansed
+  };
+}
+
+module.exports = {
+  init: init
+  // exposed for testing
+  , getOptions: getOptions
+  , makeRecentSgvFilter: makeRecentSgvFilter
+  , rawDataEntry: rawDataEntry
+};
diff --git a/lib/plugins/pluginbase.js b/lib/plugins/pluginbase.js
index fe00b805082..400a5a1fc6b 100644
--- a/lib/plugins/pluginbase.js
+++ b/lib/plugins/pluginbase.js
@@ -2,7 +2,7 @@
 
 var _ = require('lodash');
 
-var TOOLTIP_WIDTH = 250;  //min-width + padding
+var TOOLTIP_WIDTH = 275;  //min-width + padding
 
 function init (majorPills, minorPills, statusPills, bgStatus, tooltip) {
 
@@ -61,16 +61,19 @@ function init (majorPills, minorPills, statusPills, bgStatus, tooltip) {
 
     pill.addClass(options.pillClass);
 
-    if (options.directText) {
-      pill.text(options.label);
+    if (options.directHTML) {
+      pill.html(options.label);
     } else {
-      pill.find('label').attr('class', options.labelClass).text(options.label);
-
-      pill.find('em')
-        .attr('class', options.valueClass)
-        .toggle(options.value != null)
-        .text(options.value)
-      ;
+      if (options.directText) {
+        pill.text(options.label);
+      } else {
+        pill.find('label').attr('class', options.labelClass).text(options.label);
+        pill.find('em')
+          .attr('class', options.valueClass)
+          .toggle(options.value != null)
+          .text(options.value)
+        ;
+      }
     }
 
     if (options.info  && options.info.length) {
@@ -82,7 +85,7 @@ function init (majorPills, minorPills, statusPills, bgStatus, tooltip) {
         tooltip.transition().duration(200).style('opacity', .9);
 
         var windowWidth = $(tooltip).parent().parent().width();
-        var left = event.pageX + TOOLTIP_WIDTH < windowWidth ? event.pageX : windowWidth - TOOLTIP_WIDTH;
+        var left = event.pageX + TOOLTIP_WIDTH < windowWidth ? event.pageX : windowWidth - TOOLTIP_WIDTH - 10;
         tooltip.html(html)
           .style('left', left + 'px')
           .style('top', (event.pageY + 15) + 'px');
diff --git a/lib/profilefunctions.js b/lib/profilefunctions.js
index 4bace0fb960..48615583b9f 100644
--- a/lib/profilefunctions.js
+++ b/lib/profilefunctions.js
@@ -3,6 +3,7 @@
 var _ = require('lodash');
 var moment = require('moment-timezone');
 var NodeCache = require('node-cache');
+var times = require('./times');
 
 function init(profileData) {
 
@@ -74,6 +75,8 @@ function init(profileData) {
       });
     }
 
+	if (returnValue) { returnValue = parseFloat(returnValue); }
+
     profile.timeValueCache[cacheKey] = returnValue;
 
     return returnValue;
@@ -123,6 +126,36 @@ function init(profileData) {
     return profile.getValueByTime(time,'basal');
   };
 
+  profile.tempBasalTreatment = function tempBasalTreatment(time, basaltreatments) {
+    var treatment = null;
+    basaltreatments.forEach( function eachTreatment (t) {
+        var duration = times.mins(t.duration || 0).msecs;
+        if (time < t.mills + duration && time > t.mills) {
+          treatment = t;
+        }
+    });
+    return treatment;
+  };
+
+  profile.getTempBasal = function getTempBasal(time, basaltreatments) {
+    var basal = profile.getValueByTime(time,'basal');
+    var tempbasal = basal;
+    var treatment = profile.tempBasalTreatment(time, basaltreatments);
+
+    //special handling for absolute to support temp to 0
+    if (treatment && !isNaN(treatment.absolute) && treatment.duration > 0) {
+      tempbasal = treatment.absolute;
+    } else if (treatment && treatment.percent) {
+      tempbasal = basal * (100 + treatment.percent) / 100;
+    }
+
+    return {
+      basal: basal
+      , treatment: treatment
+      , tempbasal: tempbasal
+    };
+  };
+
   if (profileData) { profile.loadData(profileData); }
 
   return profile;
diff --git a/lib/report_plugins/daytoday.js b/lib/report_plugins/daytoday.js
index 18ba0f23531..bbbc482e0bf 100644
--- a/lib/report_plugins/daytoday.js
+++ b/lib/report_plugins/daytoday.js
@@ -2,6 +2,7 @@
 
 var _ = require('lodash');
 var moment = window.moment;
+var times = require('../times');
 
 var daytoday = {
   name: 'daytoday'
@@ -21,6 +22,7 @@ daytoday.html = function html(client) {
       translate('Display') + ': '
     + '<input type="checkbox" id="rp_optionsinsulin" checked><span style="color:blue;opacity:0.5">'+translate('Insulin')+'</span>'
     + '<input type="checkbox" id="rp_optionscarbs" checked><span style="color:red;opacity:0.5">'+translate('Carbs')+'</span>'
+    + '<input type="checkbox" id="rp_optionsbasal" checked><span style="color:#0099ff;opacity:0.5">'+translate('Basal rate')+'</span>'
     + '<input type="checkbox" id="rp_optionsnotes" checked>'+translate('Notes')
     + '<input type="checkbox" id="rp_optionsfood" checked>'+translate('Food')
     + '<input type="checkbox" id="rp_optionsraw"><span style="color:gray;opacity:1">'+translate('Raw')+'</span>'
@@ -73,7 +75,7 @@ daytoday.report = function report_daytoday(datastorage,sorteddaystoshow,options)
       '12am', '', '2am', '', '4am', '', '6am', '', '8am', '', '10am', '',
       '12pm', '', '2pm', '', '4pm', '', '6pm', '', '8pm', '', '10pm', '', '12am'
     ];
-    if (Nightscout.client.settings.timeFormat === '24') {
+    if (Nightscout.client.settings.timeFormat === 24) {
       return ('00' + i).slice(-2);
     } else {
       return t12[i];
@@ -85,67 +87,17 @@ daytoday.report = function report_daytoday(datastorage,sorteddaystoshow,options)
       , charts
       , context
       , xScale2, yScale2
-      , yInsulinScale, yCarbsScale
+      , yInsulinScale, yCarbsScale, yScaleBasals
       , xAxis2, yAxis2
       , dateFn = function (d) { return new Date(d.date) }
       , foodtexts = 0;
 
-    // Tick Values
-    if (options.scale === report_plugins.consts.SCALE_LOG) {
-      if (client.settings.units === 'mmol') {
-        tickValues = [
-            2.0
-          , 3.0
-          , options.targetLow
-          , 6.0
-          , 8.0
-          , options.targetHigh
-          , 16.0
-          , 22.0
-        ];
-      } else {
-        tickValues = [
-            40
-          , 60
-          , options.targetLow
-          , 120
-          , 160
-          , options.targetHigh
-          , 250
-          , 400
-        ];
-      }
-    } else {
-      if (client.settings.units === 'mmol') {
-        tickValues = [
-            2.0
-          , 4.0
-          , 6.0
-          , 8.0
-          , 10.0
-          , 12.0
-          , 14.0
-          , 16.0
-          , 18.0
-          , 20.0
-          , 22.0
-        ];
-      } else {
-        tickValues = [
-            40
-          , 80
-          , 120
-          , 160
-          , 200
-          , 240
-          , 280
-          , 320
-          , 360
-          , 400
-        ];
-      }
-    }
-    
+   tickValues = client.ticks(client, {
+     scaleY: options.scale === report_plugins.consts.SCALE_LOG ? 'log' : 'linear'
+     , targetTop: options.targetHigh
+     , targetBottom: options.targetLow
+   });
+
    // create svg and g to contain the chart contents
     charts = d3.select('#daytodaychart-' + day).html(
       '<b>'+
@@ -178,6 +130,8 @@ daytoday.report = function report_daytoday(datastorage,sorteddaystoshow,options)
     yCarbsScale = d3.scale.linear()
       .domain([0, options.maxCarbsValue*1.25]);
 
+    yScaleBasals = d3.scale.linear();
+    
     xAxis2 = d3.svg.axis()
       .scale(xScale2)
       .tickFormat(timeTicks)
@@ -206,6 +160,7 @@ daytoday.report = function report_daytoday(datastorage,sorteddaystoshow,options)
     yScale2.range([chartHeight,0]);
     yInsulinScale.range([chartHeight,0]);
     yCarbsScale.range([chartHeight,0]);
+    yScaleBasals.range([chartHeight * 3 / 4, chartHeight]);
 
     // add target BG rect
     context.append('rect')
@@ -225,7 +180,7 @@ daytoday.report = function report_daytoday(datastorage,sorteddaystoshow,options)
       .attr('class', 'y axis');
 
     context.select('.y')
-      .attr('transform', 'translate(' + (/*chartWidth + */ padding.left) + ',' + padding.top + ')')
+      .attr('transform', 'translate(' + (padding.left) + ',' + padding.top + ')')
       .style('stroke', 'black')
       .style('shape-rendering', 'crispEdges')
       .style('fill', 'none')
@@ -290,10 +245,20 @@ daytoday.report = function report_daytoday(datastorage,sorteddaystoshow,options)
     contextCircles.exit()
       .remove();
 
-    var to = moment(day).add(1, 'days'); //.add(new Date().getTimezoneOffset(), 'minutes');
-    var from = moment(day); //.add(new Date().getTimezoneOffset(), 'minutes');
+    var to = moment(day).add(1, 'days'); 
+    var from = moment(day); 
     var iobpolyline = '', cobpolyline = '';
-    for (var dt=from; dt < to; dt.add(5, 'minutes')) {
+    
+    // basals data
+    var linedata = [];
+    var notemplinedata = [];
+    var basalareadata = [];
+    var tempbasalareadata = [];
+    var lastbasal = 0;
+    var basals = context.append('g');
+
+
+    for (var dt=moment(from); dt < to; dt.add(5, 'minutes')) {
       if (options.iob) {
         var iob = Nightscout.plugins('iob').calcTotal(data.treatments,profile,dt.toDate()).iob;
         if (dt!==from) {
@@ -308,6 +273,22 @@ daytoday.report = function report_daytoday(datastorage,sorteddaystoshow,options)
         }
         cobpolyline += (xScale2(dt.toDate()) + padding.left) + ',' + (yCarbsScale(cob) + padding.top) + ' ';
       }
+      if (options.basal)  {
+        var date = dt.format('x');
+        var basalvalue = profile.getTempBasal(date, datastorage.tempbasaltreatments);
+        if (!_.isEqual(lastbasal, basalvalue)) {
+          linedata.push( { d: date, b: basalvalue.tempbasal } );
+          notemplinedata.push( { d: date, b: basalvalue.basal } );
+          if (basalvalue.treatment) {
+            tempbasalareadata.push( { d: date, b: basalvalue.tempbasal } );
+            basalareadata.push( { d: date, b: 0 } );
+          } else {
+            basalareadata.push( { d: date, b: basalvalue.tempbasal } );
+            tempbasalareadata.push( { d: date, b: 0 } );
+          }
+        }
+        lastbasal = basalvalue;
+      }
     }
     if (options.iob) {
       context.append('polyline')
@@ -324,6 +305,83 @@ daytoday.report = function report_daytoday(datastorage,sorteddaystoshow,options)
         .attr('points',cobpolyline);
     }  
 
+    if (options.basal) {
+      var toTempBasal = profile.getTempBasal(to.format('x'), datastorage.tempbasaltreatments);
+
+      linedata.push( { d: to.format('x'), b: toTempBasal.tempbasal } );
+      notemplinedata.push( { d: to.format('x'), b: toTempBasal.basal } );
+      basalareadata.push( { d: to.format('x'), b: toTempBasal.basal } );
+      tempbasalareadata.push( { d: to.format('x'), b: toTempBasal.tempbasal } );
+      
+      yScaleBasals.domain([d3.max(linedata, function(d) { return d.b; }), 0]);
+
+      var valueline = d3.svg.line()
+        .interpolate('step-after')
+        .x(function(d) { return xScale2(d.d) + padding.left; })
+        .y(function(d) { return yScaleBasals(d.b) + padding.top; });
+
+      var area = d3.svg.area()
+        .interpolate('step-after')
+        .x(function(d) { return xScale2(d.d) + padding.left; })
+        .y0(yScaleBasals(0) + padding.top)
+        .y1(function(d) { return yScaleBasals(d.b) + padding.top; });
+        
+      var g = basals.append('g');
+
+      g.append('path')
+        .attr('class', 'line basalline')
+        .attr('stroke', '#0099ff')
+        .attr('stroke-width', 1)
+        .attr('fill', 'none')
+        .attr('d', valueline(linedata))
+        .attr('clip-path', 'url(#clip)');
+
+      g.append('path')
+        .attr('class', 'line notempline')
+        .attr('stroke', '#0099ff')
+        .attr('stroke-width', 1)
+        .attr('stroke-dasharray', ('3, 3'))
+        .attr('fill', 'none')
+        .attr('d', valueline(notemplinedata))
+        .attr('clip-path', 'url(#clip)');
+
+      g.append('path')
+        .attr('class', 'area basalarea')
+        .datum(basalareadata)
+        .attr('fill', '#0099ff')
+        .attr('fill-opacity', .1)
+        .attr('stroke-width', 0)
+        .attr('d', area);
+
+      g.append('path')
+        .attr('class', 'area tempbasalarea')
+        .datum(tempbasalareadata)
+        .attr('fill', '#0099ff')
+        .attr('fill-opacity', .3)
+        .attr('stroke-width', 1)
+        .attr('d', area);
+
+      datastorage.tempbasaltreatments.forEach(function (t) {
+        // only if basal and focus interval overlap and there is a chance to fit
+        if (t.mills < to.format('x') && t.mills + times.mins(t.duration).msecs > from.format('x')) {
+          var text = g.append('text')
+            .attr('class', 'tempbasaltext')
+            .attr('font-size', '12px')
+            .attr('font-weight', 'bold')
+            .attr('fill', '#0099ff')
+            .attr('text-anchor', 'middle')
+            .attr('dy', '.35em')
+            .attr('x', xScale2((Math.max(t.mills, from.format('x')) + Math.min(t.mills + times.mins(t.duration).msecs, to.format('x')))/2) + padding.left)
+            .attr('y', yScaleBasals(0) - 10 + padding.top)
+            .text((t.percent ? (t.percent > 0 ? '+' : '') + t.percent + '%' : '') + (t.absolute ? t.absolute + 'U' : ''));
+          // better hide if not fit
+          if (text.node().getBBox().width > xScale2(t.mills + times.mins(t.duration).msecs) - xScale2(t.mills)) {
+            text.attr('display', 'none');
+          }
+        }
+      });
+    }
+    
     data.treatments.forEach(function (treatment) {
       if (treatment.boluscalc && treatment.boluscalc.foods && treatment.boluscalc.foods.length > 0 || treatment.notes) {
         var lastfoodtext = foodtexts;
@@ -338,19 +396,19 @@ daytoday.report = function report_daytoday(datastorage,sorteddaystoshow,options)
               .style('font-size', '10px')
               .style('font-weight', 'normal')
               .attr('fill', 'black')
-              .attr('y', foodtexts * 15)
+              .attr('y', foodtexts * 15 + padding.top)
               .attr('transform', 'translate(' + (xScale2(treatment.mills) + padding.left) + ',' + padding.top + ')')
               .html(text);
-            foodtexts = (foodtexts+1)%6;
+            foodtexts = (foodtexts + 1) % 6;
             drawpointer = true;
           }
         }
-        if (treatment.notes && options.notes) {
+        if (treatment.notes && options.notes && !treatment.duration) {
           context.append('text')
             .style('font-size', '10px')
             .style('font-weight', 'normal')
             .attr('fill', 'black')
-            .attr('y', foodtexts * 15)
+            .attr('y', foodtexts * 15 + padding.top)
             .attr('transform', 'translate(' + (xScale2(treatment.mills) + padding.left) + ',' + padding.top + ')')
             .html(treatment.notes);
           foodtexts = (foodtexts+1)%6;
@@ -382,8 +440,9 @@ daytoday.report = function report_daytoday(datastorage,sorteddaystoshow,options)
           .style('font-size', '12px')
           .style('font-weight', 'bold')
           .attr('fill', 'red')
-          .attr('y', yCarbsScale(treatment.carbs)-10)
-          .attr('transform', 'translate(' + (xScale2(treatment.mills) + padding.left) + ',' + +padding.top + ')')
+          //.attr('y', yCarbsScale(treatment.carbs)-10)
+          .attr('transform', 'rotate(-45,' + (xScale2(treatment.mills) + padding.left) + ',' + (padding.top+yCarbsScale(treatment.carbs)) + ') ' +
+            'translate(' + (xScale2(treatment.mills) + padding.left +10) + ',' + (padding.top+yCarbsScale(treatment.carbs)) + ')')
           .text(treatment.carbs+' g ('+(treatment.carbs/ic).toFixed(2)+'U)');
       }
       
@@ -400,12 +459,13 @@ daytoday.report = function report_daytoday(datastorage,sorteddaystoshow,options)
           .style('font-size', '12px')
           .style('font-weight', 'bold')
           .attr('fill', 'blue')
-          .attr('y', yInsulinScale(treatment.insulin)-10)
-          .attr('transform', 'translate(' + (xScale2(treatment.mills) + padding.left - 2) + ',' + +padding.top + ')')
+          //.attr('y', yInsulinScale(treatment.insulin)-10)
+          .attr('transform', 'rotate(-45,' + (xScale2(treatment.mills) + padding.left - 2) + ',' + (padding.top+yInsulinScale(treatment.insulin)) + ')' +
+            'translate(' + (xScale2(treatment.mills) + padding.left + 10) + ',' + (padding.top+yInsulinScale(treatment.insulin)) + ')')
           .text(treatment.insulin+'U');
       }
-      // other treatments
-      if (!treatment.insulin && !treatment.carbs) {
+      // other treatments without duration
+      if (!treatment.insulin && !treatment.carbs && !treatment.duration && treatment.eventType.indexOf('Temp Basal') < 0) {
         context.append('circle')
           .attr('cx', xScale2(treatment.mills) + padding.left)
           .attr('cy', yScale2(scaledTreatmentBG(treatment,data.sgv)) + padding.top)
@@ -422,6 +482,30 @@ daytoday.report = function report_daytoday(datastorage,sorteddaystoshow,options)
           .attr('x', xScale2(treatment.mills) + padding.left + 10)
           .text(translate(client.careportal.resolveEventName(treatment.eventType)));
       }
+      // other treatments with duration
+      if (!treatment.insulin && !treatment.carbs && treatment.duration && treatment.eventType.indexOf('Temp Basal') < 0) {
+        context.append('rect')
+          .attr('x', xScale2(treatment.mills) + padding.left)
+          .attr('y', 0 + padding.top)
+          .attr('width', xScale2(treatment.mills + times.mins(treatment.duration).msecs) - xScale2(treatment.mills))
+          .attr('height', chartHeight)
+          //.attr('rx', 5)
+          //.attr('ry', 5)
+          .attr('stroke-width', 1)
+          .attr('opacity', .2)
+          .attr('stroke', 'white')
+          .attr('fill', treatment.eventType === 'Exercise' ? 'Violet' : (treatment.eventType === 'Note' ? 'Salmon' : 'black'));
+        context.append('text')
+          .style('font-size', '12px')
+          .style('font-weight', 'bold')
+          .attr('fill', treatment.eventType === 'Exercise' ? 'Violet' : (treatment.eventType === 'Note' ? 'Salmon' : 'black'))
+          .attr('text-anchor', 'middle')
+          .attr('dy', '.35em')
+          .attr('y', foodtexts * 15 + 10 + padding.top)
+          .attr('x', xScale2(treatment.mills + times.mins(treatment.duration).msecs/2) + padding.left)
+          .text(treatment.notes);
+        foodtexts = (foodtexts + 1) % 6;
+      }
     });
   }
 };
diff --git a/lib/report_plugins/index.js b/lib/report_plugins/index.js
index 91c8ea4a66c..5c8c0356444 100644
--- a/lib/report_plugins/index.js
+++ b/lib/report_plugins/index.js
@@ -20,6 +20,10 @@ function init() {
       , require('./treatments')()
     ];
 
+  consts.scaleYFromSettings = function scaleYFromSettings (client) {
+    return client.settings.scaleY === 'linear' ? consts.SCALE_LINEAR : consts.SCALE_LOG;
+  };
+
   function plugins(name) {
     if (name) {
       return _.find(allPlugins, {name: name});
diff --git a/lib/report_plugins/percentile.js b/lib/report_plugins/percentile.js
index 680e7f66d86..bc8d67ad8fa 100644
--- a/lib/report_plugins/percentile.js
+++ b/lib/report_plugins/percentile.js
@@ -41,16 +41,17 @@ percentile.report = function report_percentile(datastorage, sorteddaystoshow, op
   var data = datastorage.allstatsrecords;
   
   var bins = [];
+  var filterFunc = function withinWindow(record) {
+    var recdate = new Date(record.displayTime);
+    return recdate.getHours() === hour && recdate.getMinutes() >= minute && recdate.getMinutes() < minute + minutewindow;
+  };
+  
   for (var hour = 0; hour < 24; hour++) {
     for (var minute = 0; minute < 60; minute = minute + minutewindow) {
       var date = new Date();
       date.setHours(hour);
       date.setMinutes(minute);
-      var readings = data.filter(function(record) {
-        var recdate = new Date(record.displayTime);
-        return recdate.getHours() === hour && recdate.getMinutes() >= minute &&
-          recdate.getMinutes() < minute + minutewindow;
-      });
+      var readings = data.filter(filterFunc);
       readings = readings.map(function(record) {
         return record.sgv;
       });
diff --git a/lib/report_plugins/success.js b/lib/report_plugins/success.js
index 0199c453bf1..ed55c3687b5 100644
--- a/lib/report_plugins/success.js
+++ b/lib/report_plugins/success.js
@@ -58,8 +58,8 @@ success.report = function report_success(datastorage, sorteddaystoshow, options)
 
   var ss = require('simple-statistics');
 
-  var low = parseInt(options.targetLow),
-    high = parseInt(options.targetHigh);
+  var low = options.targetLow,
+    high = options.targetHigh;
 
   var data = datastorage.allstatsrecords;
     
diff --git a/lib/report_plugins/treatments.js b/lib/report_plugins/treatments.js
index 899ae39bcc4..a129b2550d6 100644
--- a/lib/report_plugins/treatments.js
+++ b/lib/report_plugins/treatments.js
@@ -44,10 +44,25 @@ treatments.html = function html(client) {
     + '      </label>'
     + '      <br>'
     + '      <label for="rped_insulinGiven">'
-    + '          <span class="translate">Insulin Given</span>'
+    + translate('Insulin Given')
     + '          <input type="number" step="0.05" min="0" id="rped_insulinGiven" placeholder="' + translate('Amount in units') + '"/>'
     + '      </label>'
     + '      <br>'
+    + '      <label for="rped_duration">'
+    + translate('Duration')
+    + '          <input type="number" step="1" min="0" id="rped_duration" placeholder="' + translate('Duration in minutes') + '"/>'
+    + '      </label>'
+    + '      <br>'
+    + '      <label for="rped_percent">'
+    + translate('Percent')
+    + '          <input type="number" step="10" id="rped_percent" placeholder="' + translate('Basal change in %') + '"/>'
+    + '      </label>'
+    + '      <br>'
+    + '      <label for="rped_absolute">'
+    + translate('Basal value')
+    + '          <input type="number" step="0.05" id="rped_absolute" placeholder="' + translate('Absolute basal value') + '"/>'
+    + '      </label>'
+    + '      <br>'
     + '      <label for="rped_adnotes">' + translate('Additional Notes, Comments') + '</label>'
     + '      <textarea id="rped_adnotes" style="width:300px"></textarea><br>'
     + '      <label for="rped_enteredBy" class="left-column extra-space">'
@@ -95,6 +110,9 @@ treatments.report = function report_treatments(datastorage, sorteddaystoshow, op
 
     pushIf(data.carbs, translate('Carbs Given') + ': ' + data.carbs);
     pushIf(data.insulin, translate('Insulin Given') + ': ' + data.insulin);
+    pushIf(data.duration, translate('Duration') + ': ' + data.duration);
+    pushIf(data.percent, translate('Percent') + ': ' + data.percent);
+    pushIf(data.absolute, translate('Basal value') + ': ' + data.absolute);
     pushIf(data.preBolus, translate('Carb Time') + ': ' + data.preBolus + ' ' + translate('mins'));
     pushIf(data.notes, translate('Notes') + ': ' + data.notes);
     pushIf(data.enteredBy, translate('Entered By') + ': ' + data.enteredBy);
@@ -139,12 +157,16 @@ treatments.report = function report_treatments(datastorage, sorteddaystoshow, op
     // prepare event list
     $('#rped_eventType').empty();
     _.each(client.careportal.events, function eachEvent(event) {
+      if (event.name.indexOf('Temp Basal') > -1) {
+        return;
+      }
       $('#rped_eventType').append('<option value="' + event.val+ '">' + translate(event.name) + '</option>');
     });
+    $('#rped_eventType').append('<option value="Temp Basal">' + translate('Temp Basal') + '</option>');
 
     $( '#rp_edittreatmentdialog' ).dialog({
-        width: 350
-      , height: 500
+        width: 360
+      , height: 580
       ,  buttons: [
         { text: translate('Save'),
           class: 'leftButton',
@@ -154,6 +176,9 @@ treatments.report = function report_treatments(datastorage, sorteddaystoshow, op
             data.glucoseType = $('#rp_edittreatmentdialog').find('input[name=rp_bginput]:checked').val();
             data.carbs = $('#rped_carbsGiven').val();
             data.insulin = $('#rped_insulinGiven').val();
+            data.duration = $('#rped_duration').val();
+            data.percent = $('#rped_percent').val();
+            data.absolute = $('#rped_absolute').val();
             data.notes = $('#rped_adnotes').val();
             data.enteredBy = $('#rped_enteredBy').val();
             data.eventTime = new Date(client.utils.mergeInputTime($('#rped_eventTimeValue').val(), $('#rped_eventDateValue').val())).toISOString();
@@ -181,6 +206,9 @@ treatments.report = function report_treatments(datastorage, sorteddaystoshow, op
         $('#rped_bgmanual').prop('checked', data.glucoseType === 'Manual');
         $('#rped_carbsGiven').val(data.carbs ? data.carbs : '');
         $('#rped_insulinGiven').val(data.insulin ? data.insulin : '');
+        $('#rped_duration').val(data.duration ? data.duration : '');
+        $('#rped_percent').val(data.percent ? data.percent : '');
+        $('#rped_absolute').val(data.absolute ? data.absolute : '');
         $('#rped_adnotes').val(data.notes ? data.notes : '');
         $('#rped_enteredBy').val(data.enteredBy ? data.enteredBy : '');
         $('#rped_eventTimeValue').val(moment(data.created_at).format('HH:mm'));
@@ -237,13 +265,16 @@ treatments.report = function report_treatments(datastorage, sorteddaystoshow, op
     .append($('<th>').css('width','150px').attr('align','left').append(translate('Blood Glucose')))
     .append($('<th>').css('width','50px').attr('align','left').append(translate('Insulin')))
     .append($('<th>').css('width','50px').attr('align','left').append(translate('Carbs')))
+    .append($('<th>').css('width','50px').attr('align','left').append(translate('Duration')))
+    .append($('<th>').css('width','50px').attr('align','left').append(translate('Percent')))
+    .append($('<th>').css('width','50px').attr('align','left').append(translate('Basal value')))
     .append($('<th>').css('width','150px').attr('align','left').append(translate('Entered By')))
     .append($('<th>').css('width','300px').attr('align','left').append(translate('Notes')))
   );
   
   sorteddaystoshow.forEach(function (day) {
     table.append($('<tr>')
-      .append($('<td>').attr('colspan','8').css('background','lightgray')
+      .append($('<td>').attr('colspan','11').css('background','lightgray')
         .append($('<b>').append(report_plugins.utils.localeDate(day)))
       )
     );
@@ -264,6 +295,9 @@ treatments.report = function report_treatments(datastorage, sorteddaystoshow, op
         .append($('<td>').attr('align','center').append(tr.glucose ? tr.glucose + ' ('+translate(tr.glucoseType)+')' : ''))
         .append($('<td>').attr('align','center').append(tr.insulin ? tr.insulin : ''))
         .append($('<td>').attr('align','center').append(tr.carbs ? tr.carbs : ''))
+        .append($('<td>').attr('align','center').append(tr.duration ? tr.duration : ''))
+        .append($('<td>').attr('align','center').append(tr.percent ? tr.percent : ''))
+        .append($('<td>').attr('align','center').append(tr.absolute ? tr.absolute : ''))
         .append($('<td>').append(tr.enteredBy ? tr.enteredBy : ''))
         .append($('<td>').append(tr.notes ? tr.notes : ''))
       );
diff --git a/lib/settings.js b/lib/settings.js
index 9cc486929cc..dc0ae09a9c0 100644
--- a/lib/settings.js
+++ b/lib/settings.js
@@ -7,7 +7,7 @@ function init ( ) {
 
   var settings = {
     units: 'mg/dL'
-    , timeFormat: '12'
+    , timeFormat: 12
     , nightMode: false
     , showRawbg: 'never'
     , customTitle: 'Nightscout'
@@ -27,6 +27,7 @@ function init ( ) {
     , alarmTimeagoUrgent: true
     , alarmTimeagoUrgentMins: 30
     , language: 'en'
+    , scaleY: 'log'
     , showPlugins: ''
     , heartbeat: 60
     , baseURL: ''
@@ -45,6 +46,7 @@ function init ( ) {
     , alarmUrgentLowMins: mapNumberArray
     , alarmUrgentMins: mapNumberArray
     , alarmWarnMins: mapNumberArray
+    , timeFormat: mapNumber
   };
 
   function mapNumberArray (value) {
@@ -62,6 +64,18 @@ function init ( ) {
     }
   }
 
+  function mapNumber (value) {
+    if (!value) {
+      return value;
+    }
+
+    if (isNaN(value)) {
+      return value;
+    } else {
+      return Number(value);
+    }
+  }
+
   //TODO: getting sent in status.json, shouldn't be
   settings.DEFAULT_FEATURES = ['delta', 'direction', 'upbat', 'errorcodes'];
 
diff --git a/lib/storage.js b/lib/storage.js
index 30bfd60b0b1..e7830cbeecc 100644
--- a/lib/storage.js
+++ b/lib/storage.js
@@ -24,7 +24,10 @@ function init (env, cb, forceNewConnection) {
       }
 
       console.log('Setting up new connection to MongoDB');
-      MongoClient.connect(env.mongo, function connected(err, db) {
+      var timeout =  30 * 1000;
+      var options = { replset: { socketOptions: { connectTimeoutMS : timeout, socketTimeoutMS : timeout }}};
+
+      MongoClient.connect(env.mongo, options, function connected(err, db) {
         if (err) {
           console.log('Error connecting to MongoDB, ERROR: %j', err);
           throw err;
@@ -75,4 +78,4 @@ function init (env, cb, forceNewConnection) {
   return maybe_connect(cb);
 }
 
-module.exports = init;
\ No newline at end of file
+module.exports = init;
diff --git a/lib/times.js b/lib/times.js
index 4acf8fa0d1a..67efdda4056 100644
--- a/lib/times.js
+++ b/lib/times.js
@@ -18,6 +18,11 @@ var factories = {
       msecs: value * 1000
     };
   }
+  , msecs: function msecs(value) {
+    return {
+      mins: value / 1000 / 60, secs: value / 1000, msecs: value
+    };
+  }
 };
 
 function getOrCreate (types) {
@@ -39,6 +44,8 @@ var times = {
   , mins: function (value) { return getOrCreate('mins')(value); }
   , sec: function ( ) { return getOrCreate('secs')(1); }
   , secs: function (value) { return getOrCreate('secs')(value); }
+  , msec: function ( ) { return getOrCreate('msecs')(1); }
+  , msecs: function (value) { return getOrCreate('msecs')(value); }
 };
 
 module.exports = times;
\ No newline at end of file
diff --git a/lib/treatments.js b/lib/treatments.js
index 8f178e60d24..31d31ab4ab9 100644
--- a/lib/treatments.js
+++ b/lib/treatments.js
@@ -97,6 +97,9 @@ function prepareData(obj) {
   obj.glucose = Number(obj.glucose);
   obj.carbs = Number(obj.carbs);
   obj.insulin = Number(obj.insulin);
+  obj.duration = Number(obj.duration);
+  obj.percent = Number(obj.percent);
+  obj.absolute = Number(obj.absolute);
   obj.preBolus = Number(obj.preBolus);
 
   var eventTime;
@@ -126,9 +129,16 @@ function prepareData(obj) {
 
   deleteIfEmpty('carbs');
   deleteIfEmpty('insulin');
+  deleteIfEmpty('duration');
+  deleteIfEmpty('percent');
   deleteIfEmpty('notes');
   deleteIfEmpty('preBolus');
 
+  //special handling for absolute to support temp to 0
+  if (isNaN(obj.absolute)) {
+    delete obj.absolute;
+  }
+
   if (obj.glucose === 0 || isNaN(obj.glucose)) {
     delete obj.glucose;
     delete obj.glucoseType;
diff --git a/package.json b/package.json
index d906ea3ffd0..cb232d95fd5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Nightscout",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "description": "Nightscout acts as a web-based CGM (Continuous Glucose Montinor) to allow multiple caregivers to remotely view a patients glucose data in realtime.",
   "license": "AGPL-3.0",
   "author": "Nightscout Team",
@@ -48,7 +48,7 @@
   },
   "dependencies": {
     "async": "^0.9.0",
-    "body-parser": "^1.4.3",
+    "body-parser": "^1.14.1",
     "bootevent": "0.0.1",
     "bower": "^1.3.8",
     "browserify-express": "^0.1.4",
@@ -64,8 +64,10 @@
     "jquery": "^2.1.4",
     "lodash": "^3.9.1",
     "long": "~2.2.3",
-    "moment": "2.8.1",
+    "minimed-connect-to-nightscout": "git://github.com/mddub/minimed-connect-to-nightscout#v0.2.4",
+    "moment": "2.10.6",
     "moment-timezone": "^0.4.0",
+    "parse-duration": "^0.1.1",
     "mongodb": "^2.0.42",
     "mqtt": "~0.3.11",
     "node-cache": "^3.0.0",
@@ -73,9 +75,9 @@
     "request": "^2.58.0",
     "sgvdata": "git://github.com/ktind/sgvdata.git#wip/protobuf",
     "share2nightscout-bridge": "git://github.com/bewest/share2nightscout-bridge.git#wip/generalize",
+    "simple-statistics": "~0.7.0",
     "socket.io": "^1.3.5",
-    "traverse": "^0.6.6",
-    "simple-statistics": "~0.7.0"
+    "traverse": "^0.6.6"
   },
   "devDependencies": {
     "istanbul": "~0.3.5",
diff --git a/static/admin/index.html b/static/admin/index.html
new file mode 100644
index 00000000000..7b040f71fec
--- /dev/null
+++ b/static/admin/index.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html>
+    <head>
+      <meta name="viewport" content="width=device-width, maximum-scale=1, initial-scale=1, user-scalable=0" />
+      <meta name="apple-mobile-web-app-capable" content="yes">
+      <title>Admin tools: Nightscout</title>
+
+      <link rel="apple-touch-icon" sizes="57x57" href="/images/apple-touch-icon-57x57.png">
+      <link rel="apple-touch-icon" sizes="60x60" href="/images/apple-touch-icon-60x60.png">
+      <link rel="apple-touch-icon" sizes="72x72" href="/images/apple-touch-icon-72x72.png">
+      <link rel="apple-touch-icon" sizes="76x76" href="/images/apple-touch-icon-76x76.png">
+      <link rel="apple-touch-icon" sizes="114x114" href="/images/apple-touch-icon-114x114.png">
+      <link rel="apple-touch-icon" sizes="120x120" href="/images/apple-touch-icon-120x120.png">
+      <link rel="apple-touch-icon" sizes="144x144" href="/images/apple-touch-icon-144x144.png">
+      <link rel="apple-touch-icon" sizes="152x152" href="/images/apple-touch-icon-152x152.png">
+      <link rel="apple-touch-icon" sizes="180x180" href="/images/apple-touch-icon-180x180.png">
+      <link rel="icon" type="image/png" href="/images/favicon-32x32.png" sizes="32x32">
+      <link rel="icon" type="image/png" href="/images/android-chrome-192x192.png" sizes="192x192">
+      <link rel="icon" type="image/png" href="/images/favicon-96x96.png" sizes="96x96">
+      <link rel="icon" type="image/png" href="/images/favicon-16x16.png" sizes="16x16">
+      <link rel="manifest" href="/manifest.json">
+      <link rel="shortcut icon" href="/images/favicon.ico">
+      <meta name="msapplication-TileColor" content="#00a300">
+      <meta name="msapplication-TileImage" content="/images/mstile-144x144.png">
+      <meta name="msapplication-config" content="/browserconfig.xml">
+      <meta name="theme-color" content="#333333">
+
+      <link rel="stylesheet" type="text/css" href="/css/main.css" />
+      <link rel="stylesheet" type="text/css" href="/css/drawer.css" />
+      <link rel="stylesheet" type="text/css" href="/css/admin.css" />
+      <link rel="stylesheet" type="text/css" href="/bower_components/jquery-ui/themes/ui-darkness/jquery-ui.min.css">
+    </head>
+    <body>
+    <div id="toolbar">
+      <h1 class="customTitle">Nightscout</h1>
+    </div>
+
+    <div id="admin-tools">
+      <h1 class="translate">Admin Tools</h1>
+    </div>
+
+    <div id="admin_placeholder"></div>
+    
+    <hr>
+    <b><span class="translate">Authentication status</span>: </b>
+    <span id="authentication_placeholder"></span>
+
+    <script src="/api/v1/status.js"></script>
+    <script src="/public/js/bundle.js"></script>
+    <script src="/socket.io/socket.io.js"></script>
+    <script src="/bower_components/jQuery-Storage-API/jquery.storageapi.min.js"></script>
+    <script src="/bower_components/jquery-ui/jquery-ui.min.js"></script>
+    <script src="/bower_components/tipsy-jmalonzo/src/javascripts/jquery.tipsy.js"></script>
+    <script src="/admin/js/admin.js"></script>
+  </body>
+</html>
diff --git a/static/admin/js/admin.js b/static/admin/js/admin.js
new file mode 100644
index 00000000000..4c6cb027f1d
--- /dev/null
+++ b/static/admin/js/admin.js
@@ -0,0 +1,17 @@
+(function () {
+  'use strict';
+  //for the tests window isn't the global object
+  var Nightscout = window.Nightscout;
+  var client = Nightscout.client;
+  var admin_plugins = Nightscout.admin_plugins;
+
+  if (serverSettings === undefined) {
+    console.error('server settings were not loaded, will not call init');
+  } else {
+    client.init(serverSettings, Nightscout.plugins);
+  }
+  
+  // init HTML code
+  admin_plugins.createHTML( client );
+
+})();
diff --git a/static/css/admin.css b/static/css/admin.css
new file mode 100644
index 00000000000..1a5d8ef1e17
--- /dev/null
+++ b/static/css/admin.css
@@ -0,0 +1,27 @@
+#admin-tools h1 {
+  text-align: left;
+  margin: 10px;
+}
+
+#admin_placeholder {
+  margin-left: 20px;
+  margin-right: 20px;
+}
+
+#admin_placeholder fieldset {
+  background-color: #383838;
+  border-radius: 8px;
+}
+
+#admin_placeholder button{
+  font-size: 18px;
+  font-weight: bolder;
+  background-color: #ccc;
+  padding: 5px 10px;
+  border-radius: 5px;
+  border: 2px solid #aaa;
+  box-shadow: 2px 2px 0 #eee;
+  margin-top: 20px;
+  margin-bottom: 10px;
+  margin-right: 20px;
+}
\ No newline at end of file
diff --git a/static/css/report.css b/static/css/report.css
index 991bf73be17..6fa3350cb90 100644
--- a/static/css/report.css
+++ b/static/css/report.css
@@ -14,11 +14,11 @@ body {
   color: black;
 }
 
-#.centeraligned {
+.centeraligned {
   text-align:center;
 }
 
-ul#tabnav {
+#tabnav {
   text-align: left;
   margin: 1em 0 1em 0;
   font: bold 11px verdana, arial, sans-serif;
@@ -27,11 +27,8 @@ ul#tabnav {
   padding: 3px 10px 3px 10px;
 }
 
-ul#tabnav li {
+#tabnav li{
   display: inline;
-}
-
-ul#tabnav li{
   padding: 3px 4px;
   border: 1px solid #6c6;
   background-color: #cfc;
@@ -41,11 +38,11 @@ ul#tabnav li{
   border-bottom: none;
 }
 
-ul#tabnav li.selected  {
+#tabnav .selected  {
   background: #fff;
 }
 
-ul#tabnav li:hover {
+#tabnav li:hover {
   background: #9f9;
   cursor:pointer;
 }
diff --git a/static/index.html b/static/index.html
index 3140c402d6e..90ae04c73ae 100644
--- a/static/index.html
+++ b/static/index.html
@@ -25,10 +25,10 @@
       <meta name="msapplication-config" content="/browserconfig.xml">
       <meta name="theme-color" content="#333333">
 
-        <link rel="stylesheet" type="text/css" href="/css/drawer.css?v=0.8.1" />
-        <link rel="stylesheet" type="text/css" href="/css/main.css?v=0.8.1" />
+        <link rel="stylesheet" type="text/css" href="/css/drawer.css?v=0.8.2" />
+        <link rel="stylesheet" type="text/css" href="/css/main.css?v=0.8.2" />
         <link rel="stylesheet" type="text/css" href="/css/dropdown.css" />
-        <link rel="stylesheet" type="text/css" href="/css/sgv.css?v=0.8.1" />
+        <link rel="stylesheet" type="text/css" href="/css/sgv.css?v=0.8.2" />
         <link rel="stylesheet" type="text/css" href="/bower_components/tipsy-jmalonzo/src/stylesheets/tipsy.css" />
         <link rel="stylesheet" type="text/css" href="/bower_components/jquery-ui/themes/ui-darkness/jquery-ui.min.css">    
     </head>
@@ -45,7 +45,6 @@
             <div id="notification">
                 <a href="#"><span></span><i class="icon-cancel-circled"></i></a>
             </div>
-
             <div class="primary">
                 <div class="bgStatus current">
                     <div class="bgButton ">
@@ -83,6 +82,7 @@
                 <ul class="navigation">
                   <li><a href="/report/index.html" target="reports" class="translate">Reports</a></li>
                   <li><a id="editprofilelink" href="/profile/index.html" target="profileeditor" class="translate">Profile Editor</a></li>
+                  <li><a id="admintoolslink" href="/admin/index.html" target="admintools" class="translate">Admin Tools</a></li>
                 </ul>
                 <fieldset class="browserSettings">
                     <legend class="translate icon-cog">Settings</legend>
@@ -103,6 +103,26 @@
                         </select>
                       </dd>
                     </dl>
+                    <dl>
+                      <dt class="translate">Scale</dt>
+                      <dd>
+                        <select id="scaleY">
+                          <option class="translate" value="log">Logarithmic</option>
+                          <option class="translate" value="linear">Linear</option>
+                          <option class="translate" value="log-dynamic">Logarithmic (Dynamic)</option>
+                        </select>
+                      </dd>
+                    </dl>
+                    <dl>
+                      <dt class="translate">Render Basal</dt>
+                      <dd>
+                        <select id="basalrender">
+                          <option class="translate" value="none">None</option>
+                          <option class="translate" value="default">Default</option>
+                          <option class="translate" value="icicle">Icicle</option>
+                        </select>
+                      </dd>
+                    </dl>
                     <dl class="toggle">
                         <dt><span class="translate">Enable Alarms</span> <a class="tip" original-title="When enabled an alarm may sound."><i class="icon-help-circled"></i></a></dt>
                         <dd><input type="checkbox" id="alarm-urgenthigh-browser" /><label for="alarm-urgenthigh-browser" class="translate">Urgent High Alarm</label></dd>
@@ -178,7 +198,7 @@
                         <select id="eventType"></select>
                     </label>
 
-                    <fieldset>
+                    <fieldset id="bg">
                         <legend class="translate">Glucose Reading</legend>
                         <input type="number" step="any" id="glucoseValue" />
                         <label><br><span class="translate">Measurement Method</span><br></label>
@@ -191,15 +211,27 @@
                             <span class="translate">Sensor<br></span>
                         </label>
                     </fieldset>
-                    <label for="carbsGiven" class="left-column short-label">
+                    <label id="carbsGivenLabel" for="carbsGiven" class="left-column short-label">
                         <span class="translate">Carbs Given</span>
                         <input type="number" step="any" min="0" id="carbsGiven" placeholder="Amount in grams" class="titletranslate"/>
                     </label>
-                    <label for="insulinGiven" class="left-column short-label">
+                    <label id="insulinGivenLabel" for="insulinGiven" class="left-column short-label">
                         <span class="translate">Insulin Given</span>
                         <input type="number" step="any" min="0" id="insulinGiven" placeholder="Amount in units" class="titletranslate"/>
                     </label>
-                    <label for="preBolus" class="left-column short-label extra-space">
+                    <label id="durationLabel" for="duration" class="left-column short-label">
+                        <span class="translate">Duration</span>
+                        <input id="duration" placeholder="Duration in minutes" class="titletranslate"/>
+                    </label>
+                    <label id="percentLabel" for="percent" class="left-column short-label">
+                        <span class="translate">Percent</span>
+                        <input type="number" step="10" id="percent" placeholder="Basal change in %" class="titletranslate"/>
+                    </label>
+                    <label id="absoluteLabel" for="absolute" class="left-column short-label">
+                        <span class="translate">Basal value</span>
+                        <input type="number" step="0.05" id="absolute" placeholder="Absolute basal value" class="titletranslate"/>
+                    </label>
+                    <label id="preBolusLabel" for="preBolus" class="left-column short-label extra-space">
                         <span class="translate">Carb Time</span>
                         <select id="preBolus">
                             <option class="translate" value="-60">60 minutes earlier</option>
@@ -252,8 +284,8 @@
             <audio src="/audio/alarm2.mp3" preload="auto" loop="true" class="urgent alarm2 mp3" type="audio/mp3"></audio>
         </div>
 
-        <script src="/api/v1/status.js?v=0.8.1"></script>
-        <script src="/public/js/bundle.js?v=0.8.1"></script>
+        <script src="/api/v1/status.js?v=0.8.2"></script>
+        <script src="/public/js/bundle.js?v=0.8.2"></script>
         <script src="/socket.io/socket.io.js"></script>
         <script src="/bower_components/jQuery-Storage-API/jquery.storageapi.min.js"></script>
         <script src="/bower_components/tipsy-jmalonzo/src/javascripts/jquery.tipsy.js"></script>
diff --git a/static/profile/js/profileeditor.js b/static/profile/js/profileeditor.js
index 92309e89523..f1415d769eb 100644
--- a/static/profile/js/profileeditor.js
+++ b/static/profile/js/profileeditor.js
@@ -429,7 +429,7 @@
 
   function toDisplayTime (minfrommidnight) {
     var time = moment().startOf('day').add(minfrommidnight,'minutes');
-    return client.settings.timeFormat === '24' ? time.format('HH:mm') : time.format('h:mm A');
+    return client.settings.timeFormat === 24 ? time.format('HH:mm') : time.format('h:mm A');
   }
   
   function profileSubmit(event) {
diff --git a/static/report/index.html b/static/report/index.html
index b3ab5d23305..4b6c5e27560 100644
--- a/static/report/index.html
+++ b/static/report/index.html
@@ -27,7 +27,7 @@
       <link rel="stylesheet" type="text/css" href="/bower_components/jquery-ui/themes/ui-lightness/jquery-ui.min.css">    
     </head>
     <body>
-        <h1><img src="/images/logo1.png">Nightscout reporting</h1>
+        <h1><img src="/images/logo1.png"><span class="translate">Nightscout reporting</span></h1>
     <ul id="tabnav">
     </ul>
     <table>
diff --git a/static/report/js/report.js b/static/report/js/report.js
index 83a19c3a10e..97b60c020db 100644
--- a/static/report/js/report.js
+++ b/static/report/js/report.js
@@ -58,10 +58,10 @@
   };
 
   function fillFoodForm(event) {
-    $('#rp_category').empty().append('<option>' + translate('(none)') + '</option>');
-    for (var s in food_categories) {
+    $('#rp_category').empty().append('<option value="">' + translate('(none)') + '</option>');
+    Object.keys(food_categories).forEach(function eachCategory(s) {
       $('#rp_category').append('<option value="' + s + '">' + s + '</option>');
-    }
+    });
     filter.category = '';
     fillFoodSubcategories();
     
@@ -75,11 +75,11 @@
   function fillFoodSubcategories(event) {
     filter.category = $('#rp_category').val();
     filter.subcategory = '';
-    $('#rp_subcategory').empty().append('<option>' + translate('(none)') + '</option>');
+    $('#rp_subcategory').empty().append('<option value="">' + translate('(none)') + '</option>');
     if (filter.category !== '') {
-      for (var s in food_categories[filter.category]) {
+      Object.keys(food_categories[filter.category]).forEach(function eachSubCategory(s) {
         $('#rp_subcategory').append('<option value="' + s + '">' + s + '</option>');
-      }
+      });
     }
     doFoodFilter();
     return maybePrevent(event);
@@ -144,17 +144,6 @@
   
   // ****** FOOD CODE END ******
 
-
-  function getTimeZoneOffset () {
-    var offset;
-    if (client.sbx.data.profile.getTimezone()) {
-      offset = moment().tz(client.sbx.data.profile.getTimezone())._offset;
-    } else {
-      offset = new Date().getTimezoneOffset();
-    }
-    return offset;
-  }
-  
   function prepareGUI() {
     $('.presetdates').click(function(event) { 
       var days = $(this).attr('days');
@@ -180,32 +169,18 @@
     
     $('#rp_targetlow').val(targetBGdefault[client.settings.units.toLowerCase()].low);
     $('#rp_targethigh').val(targetBGdefault[client.settings.units.toLowerCase()].high);
+
+    if (client.settings.scaleY === 'linear') {
+      $('#rp_linear').prop('checked', true);
+    } else {
+      $('#rp_log').prop('checked', true);
+    }
     
     $('.menutab').click(switchreport_handler);
 
     setDataRange(null,7);
   }
   
-  function rawIsigToRawBg(entry, cal) {
-    var raw = 0
-      , unfiltered = parseInt(entry.unfiltered) || 0
-      , filtered = parseInt(entry.filtered) || 0
-      , sgv = entry.y
-      , scale = parseFloat(cal.scale) || 0
-      , intercept = parseFloat(cal.intercept) || 0
-      , slope = parseFloat(cal.slope) || 0;
-
-    if (slope === 0 || unfiltered === 0 || scale === 0) {
-      raw = 0;
-    } else if (filtered === 0 || sgv < 40) {
-        raw = scale * (unfiltered - intercept) / slope;
-    } else {
-        var ratio = scale * (filtered - intercept) / slope / sgv;
-        raw = scale * ( unfiltered - intercept) / slope / ratio;
-    }
-    return Math.round(raw);
-  }
-
   function sgvToColor(sgv,options) {
     var color = 'darkgreen';
 
@@ -231,7 +206,8 @@
       , carbs: true
       , iob : true
       , cob : true
-      , scale: report_plugins.consts.SCALE_LINEAR
+      , basal : true
+      , scale: report_plugins.consts.scaleYFromSettings(client)
       , units: client.settings.units
     };
 
@@ -244,6 +220,7 @@
     options.raw = $('#rp_optionsraw').is(':checked');
     options.iob = $('#rp_optionsiob').is(':checked');
     options.cob = $('#rp_optionscob').is(':checked');
+    options.basal = $('#rp_optionsbasal').is(':checked');
     options.notes = $('#rp_optionsnotes').is(':checked');
     options.food = $('#rp_optionsfood').is(':checked');
     options.insulin = $('#rp_optionsinsulin').is(':checked');
@@ -259,10 +236,8 @@
     function datefilter() {
       if ($('#rp_enabledate').is(':checked')) {
         matchesneeded++;
-        var fromdate = new Date($('#rp_from').val());
-        var todate = new Date($('#rp_to').val());
-        var from = moment.tz([fromdate.getFullYear(), fromdate.getMonth(), fromdate.getDate()],zone);
-        var to = moment.tz([todate.getFullYear(), todate.getMonth(), todate.getDate()],zone);
+        var from = moment.tz($('#rp_from').val().replace(/\//g,'-') + 'T00:00:00',zone);
+        var to = moment.tz($('#rp_to').val().replace(/\//g,'-') + 'T23:59:59',zone);
         timerange = '&find[created_at][$gte]='+from.toISOString()+'&find[created_at][$lt]='+to.toISOString();
         //console.log($('#rp_from').val(),$('#rp_to').val(),zone,timerange);
         while (from <= to) {
@@ -388,24 +363,23 @@
     
     function daysfilter() {
       matchesneeded++;
-      for (var d in daystoshow) {
-        if (daystoshow.hasOwnProperty(d)) {
-          var day = new Date(d).getDay();
-          if (day===0 && $('#rp_su').is(':checked')) { daystoshow[d]++; }
-          if (day===1 && $('#rp_mo').is(':checked')) { daystoshow[d]++; }
-          if (day===2 && $('#rp_tu').is(':checked')) { daystoshow[d]++; }
-          if (day===3 && $('#rp_we').is(':checked')) { daystoshow[d]++; }
-          if (day===4 && $('#rp_th').is(':checked')) { daystoshow[d]++; }
-          if (day===5 && $('#rp_fr').is(':checked')) { daystoshow[d]++; }
-          if (day===6 && $('#rp_sa').is(':checked')) { daystoshow[d]++; }
-        }
-      }
+      Object.keys(daystoshow).forEach( function eachDay(d) {
+        var day = new Date(d).getDay();
+        if (day===0 && $('#rp_su').is(':checked')) { daystoshow[d]++; }
+        if (day===1 && $('#rp_mo').is(':checked')) { daystoshow[d]++; }
+        if (day===2 && $('#rp_tu').is(':checked')) { daystoshow[d]++; }
+        if (day===3 && $('#rp_we').is(':checked')) { daystoshow[d]++; }
+        if (day===4 && $('#rp_th').is(':checked')) { daystoshow[d]++; }
+        if (day===5 && $('#rp_fr').is(':checked')) { daystoshow[d]++; }
+        if (day===6 && $('#rp_sa').is(':checked')) { daystoshow[d]++; }
+      });
       countDays();
       display();
     }
     
     function display() {
       var count = 0;
+      sorteddaystoshow = [];
       $('#info').html('<b>'+translate('Loading')+' ...</b>');
       for (var d in daystoshow) {
         if (daystoshow[d]===matchesneeded) {
@@ -443,19 +417,16 @@
       console.log('Total: ', daystoshow, 'Matches needed: ', matchesneeded, 'Will be loaded: ', dayscount);
    }
     
-    function dataLoadedCallback () {
+    function dataLoadedCallback (day) {
       loadeddays++;
+      sorteddaystoshow.push(day);
       if (loadeddays === dayscount) {
-        // sort array
-        sorteddaystoshow = [];
-        Object.keys(daystoshow).forEach(function (day) {
-          sorteddaystoshow.push(day);
-        });
         sorteddaystoshow.sort();
+        var from = sorteddaystoshow[0];
         if (options.order === report_plugins.consts.ORDER_NEWESTONTOP) {
           sorteddaystoshow.reverse();
         }
-        showreports(options);
+        loadTempBasals(from, function showreportscallback() { showreports(options); });
       }
     }
     
@@ -470,7 +441,7 @@
     // prepare some data used in more reports
     datastorage.allstatsrecords = [];
     datastorage.alldays = 0;
-    Object.keys(daystoshow).forEach(function (day) {
+    sorteddaystoshow.forEach(function eachDay(day) {
       datastorage.allstatsrecords = datastorage.allstatsrecords.concat(datastorage[day].statsrecords);
       datastorage.alldays++;
     });
@@ -512,7 +483,7 @@
   function loadData(day, options, callback) {
     // check for loaded data
     if (datastorage[day] && day !== moment().format('YYYY-MM-DD')) {
-      callback();
+      callback(day);
       return;
     }
     // patientData = [actual, predicted, mbg, treatment, cal, devicestatusData];
@@ -522,8 +493,13 @@
       , treatmentData = []
       , calData = []
       ;
-    var dt = new Date(day);
-    var from = dt.getTime() + getTimeZoneOffset() * 60 * 1000;
+    var from;
+    if (client.sbx.data.profile.getTimezone()) {
+      from = moment(day).tz(client.sbx.data.profile.getTimezone()).startOf('day').format('x');
+    } else {
+      from = moment(day).startOf('day').format('x');
+    }
+    from = parseInt(from);
     var to = from + 1000 * 60 * 60 * 24;
     var query = '?find[date][$gte]='+from+'&find[date][$lt]='+to+'&count=10000';
     
@@ -597,6 +573,24 @@
     });
   }
 
+  function loadTempBasals(from, callback) {
+    $('#info-' + from).html('<b>'+translate('Loading temp basal data') + ' ...</b>');
+    var tquery = '?find[created_at][$gte]='+moment(from).subtract(32, 'days').toISOString()+'&find[eventType][$eq]=Temp Basal';
+    $.ajax('/api/v1/treatments.json'+tquery, {
+      success: function (xhr) {
+        var treatmentData = xhr.map(function (treatment) {
+          var timestamp = new Date(treatment.timestamp || treatment.created_at);
+          treatment.mills = timestamp.getTime();
+          return treatment;
+        });
+        datastorage.tempbasaltreatments = treatmentData.slice();
+        datastorage.tempbasaltreatments.sort(function(a, b) { return a.mills - b.mills; });
+      }
+    }).done(function () {
+      callback();
+    });
+  }
+  
   function processData(data, day, options, callback) {
     // treatments
     data.treatments.forEach(function (d) {
@@ -610,9 +604,11 @@
 
     var cal = data.cal[data.cal.length-1];
     var temp1 = [ ];
+    var rawbg = Nightscout.plugins('rawbg');
     if (cal) {
       temp1 = data.sgv.map(function (entry) {
-        var rawBg = rawIsigToRawBg(entry, cal);
+        entry.mgdl = entry.y; // value names changed from enchilada
+        var rawBg = rawbg.calc(entry, cal);
         return { mills: entry.mills, date: new Date(entry.mills - 2 * 1000), y: rawBg, sgv: client.utils.scaleMgdl(rawBg), color: 'gray', type: 'rawbg', filtered: entry.filtered, unfiltered: entry.unfiltered };
       }).filter(function(entry) { return entry.y > 0});
     }
@@ -625,7 +621,12 @@
     data.sgv = data.sgv.concat(data.mbg.map(function (obj) { return { date: new Date(obj.mills), y: obj.y, sgv: client.utils.scaleMgdl(obj.y), color: 'red', type: 'mbg', device: obj.device } }));
 
     // make sure data range will be exactly 24h
-    var from = new Date(new Date(day).getTime() + (getTimeZoneOffset() * 60 * 1000));
+    var from;
+    if (client.sbx.data.profile.getTimezone()) {
+      from = moment(day).tz(client.sbx.data.profile.getTimezone()).startOf('day').toDate();
+    } else {
+      from = moment(day).startOf('day').toDate();
+    }
     var to = new Date(from.getTime() + 1000 * 60 * 60 * 24);
     data.sgv.push({ date: from, y: 40, sgv: 40, color: 'transparent', type: 'rawbg'});
     data.sgv.push({ date: to, y: 40, sgv: 40, color: 'transparent', type: 'rawbg'});
@@ -655,7 +656,7 @@
 
     
     datastorage[day] = data;
-    callback();
+    callback(day);
   }
 
   function maybePrevent(event) {
diff --git a/tests/admintools.test.js b/tests/admintools.test.js
new file mode 100644
index 00000000000..c990d8639bc
--- /dev/null
+++ b/tests/admintools.test.js
@@ -0,0 +1,210 @@
+'use strict';
+
+require('should');
+var _ = require('lodash');
+var benv = require('benv');
+var read = require('fs').readFileSync;
+var serverSettings = require('./fixtures/default-server-settings');
+
+var nowData = {
+  sgvs: [
+    { mgdl: 100, mills: Date.now(), direction: 'Flat', type: 'sgv' }
+  ]
+};
+
+var someData = {
+  '/api/v1/devicestatus.json?count=500': [
+    {
+    '_id': {
+        '$oid': '56096da3c5d0fef41b212362'
+    },
+    'uploaderBattery': 37,
+    'created_at': '2015-09-28T16:41:07.144Z'
+    },
+    {
+    '_id': {
+        '$oid': '56096da3c5d0fef41b212363'
+    },
+    'uploaderBattery': 38,
+    'created_at': '2025-09-28T16:41:07.144Z'
+    }
+  ],
+  '/api/v1/treatments.json?&find[created_at][$gte]=': [
+      {
+        '_id':  '5609a9203c8104a8195b1c1e',
+        'enteredBy': '',
+        'eventType': 'Carb Correction',
+        'carbs': 3,
+        'created_at': '2025-09-28T20:54:00.000Z'
+      }
+    ],
+  '/api/v1/entries.json?&find[date][$gte]=': [
+      {
+        '_id': '560983f326c5a592d9b9ae0c',
+        'device': 'dexcom',
+        'date': 1543464149000,
+        'sgv': 83,
+        'direction': 'Flat',
+        'type': 'sgv',
+        'filtered': 107632,
+        'unfiltered': 106256,
+        'rssi': 178,
+        'noise': 1
+      }
+    ]
+  };
+
+
+describe('admintools', function ( ) {
+  var self = this;
+
+  before(function (done) {
+    benv.setup(function() {
+      self.$ = require('jquery');
+      self.$.localStorage = require('./fixtures/localstorage');
+
+      self.$.fn.tipsy = function mockTipsy ( ) { };
+
+      self.$.fn.dialog = function mockDialog (opts) {
+        function maybeCall (name, obj) {
+          if (obj[name] && obj[name].call) {
+            obj[name]();
+          }
+
+        }
+        maybeCall('open', opts);
+
+        _.forEach(opts.buttons, function (button) {
+          maybeCall('click', button);
+        });
+      };
+
+      var indexHtml = read(__dirname + '/../static/admin/index.html', 'utf8');
+      self.$('body').html(indexHtml);
+
+      //var filesys = require('fs');
+      //var logfile = filesys.createWriteStream('out.txt', { flags: 'a'} )
+      
+      self.$.ajax = function mockAjax (url, opts) {
+        //logfile.write(url+'\n');
+        //console.log(url,opts);
+        if (opts && opts.success && opts.success.call) {
+          if (url.indexOf('/api/v1/treatments.json?&find[created_at][$gte]=')===0) {
+            url = '/api/v1/treatments.json?&find[created_at][$gte]=';
+          }
+          if (url.indexOf('/api/v1/entries.json?&find[date][$gte]=')===0) {
+            url = '/api/v1/entries.json?&find[date][$gte]=';
+          }
+          return {
+            done: function mockDone (fn) {
+                if (someData[url]) {
+                  console.log('+++++Data for ' + url + ' sent');
+                  opts.success(someData[url]);
+                } else {
+                  console.log('-----Data for ' + url + ' missing');
+                  opts.success([]);
+                }
+              fn();
+              return self.$.ajax();
+            },
+            fail: function mockFail () {
+              return self.$.ajax();
+            }
+          };
+        }
+        return {
+          done: function mockDone (fn) {
+            fn({message: 'OK'});
+            return self.$.ajax();
+            },
+          fail: function mockFail () {
+            return self.$.ajax();
+            }
+        };
+      };
+
+      self.$.plot = function mockPlot () {
+      };
+
+      var d3 = require('d3');
+      //disable all d3 transitions so most of the other code can run with jsdom
+      d3.timer = function mockTimer() { };
+
+      benv.expose({
+        $: self.$
+        , jQuery: self.$
+        , d3: d3
+        , serverSettings: serverSettings
+        , io: {
+          connect: function mockConnect ( ) {
+            return {
+              on: function mockOn ( ) { }
+            };
+          }
+        }
+      });
+
+      benv.require(__dirname + '/../bundle/bundle.source.js');
+      benv.require(__dirname + '/../static/admin/js/admin.js');
+
+      done();
+    });
+  });
+
+  after(function (done) {
+    benv.teardown(true);
+    done();
+  });
+
+  it ('should produce some html', function (done) {
+    var plugins = require('../lib/plugins/')().registerClientDefaults();
+    var client = require('../lib/client');
+
+    var hashauth = require('../lib/hashauth');
+    hashauth.init(client,$);
+    hashauth.verifyAuthentication = function mockVerifyAuthentication(next) {
+      hashauth.authenticated = true;
+      next(true);
+    };
+
+     window.confirm = function mockConfirm (text) {
+       console.log('Confirm:', text);
+       return true;
+     };
+
+     window.alert = function mockAlert () {
+       return true;
+     };
+
+    client.init(serverSettings, plugins);
+    client.dataUpdate(nowData);
+    
+    //var result = $('body').html();
+    //var filesys = require('fs');
+    //var logfile = filesys.createWriteStream('out.txt', { flags: 'a'} )
+    //logfile.write($('body').html());
+    
+    //console.log(result);
+
+    $('#admin_cleanstatusdb_0_html + button').text().should.equal('Delete all documents'); // devicestatus button
+    $('#admin_cleanstatusdb_0_status').text().should.equal('Database contains 2 records'); // devicestatus init result
+    
+    $('#admin_cleanstatusdb_0_html + button').click();
+    $('#admin_cleanstatusdb_0_status').text().should.equal('All records removed ...'); // devicestatus code result
+
+    $('#admin_futureitems_0_html + button').text().should.equal('Remove treatments in the future'); // futureitems button 0
+    $('#admin_futureitems_0_status').text().should.equal('Database contains 1 future records'); // futureitems init result 0
+    
+    $('#admin_futureitems_0_html + button').click();
+    $('#admin_futureitems_0_status').text().should.equal('Record 5609a9203c8104a8195b1c1e removed ...'); // futureitems code result 0
+
+    $('#admin_futureitems_1_html + button').text().should.equal('Remove entries in the future'); // futureitems button 1
+    $('#admin_futureitems_1_status').text().should.equal('Database contains 1 future records'); // futureitems init result 1
+    
+    $('#admin_futureitems_1_html + button').click();
+    $('#admin_futureitems_1_status').text().should.equal('Record 560983f326c5a592d9b9ae0c removed ...'); // futureitems code result 1
+
+    done();
+  });
+
+});
diff --git a/tests/careportal.test.js b/tests/careportal.test.js
index 11821fd3ffe..e7c371ee195 100644
--- a/tests/careportal.test.js
+++ b/tests/careportal.test.js
@@ -9,6 +9,7 @@ var nowData = {
   sgvs: [
     { mgdl: 100, mills: Date.now(), direction: 'Flat', type: 'sgv' }
   ]
+  , treatments: []
 };
 
 describe('client', function ( ) {
diff --git a/tests/client.test.js b/tests/client.test.js
index 18ad0f6ee1b..ed7e8984175 100644
--- a/tests/client.test.js
+++ b/tests/client.test.js
@@ -30,7 +30,8 @@ var nowData = {
   ], devicestatus: { uploaderBattery: 100 }
   , treatments: [
     {
-      insulin: '1.00'
+      eventType: 'Snack Bolus'
+      , insulin: '1.00'
       , carbs: '18'
       , mills: now
     }
diff --git a/tests/direction.test.js b/tests/direction.test.js
index 472858b6575..bf421795d01 100644
--- a/tests/direction.test.js
+++ b/tests/direction.test.js
@@ -47,7 +47,7 @@ describe('BG direction', function ( ) {
   it('set a pill to the direction', function (done) {
     var pluginBase = {
       updatePillText: function mockedUpdatePillText (plugin, options) {
-        options.label.should.equal('→');
+        options.label.should.equal('→&#xfe0e;');
         done();
       }
     };
diff --git a/tests/fixtures/default-server-settings.js b/tests/fixtures/default-server-settings.js
index 20bbaa1b854..113a5fa4aeb 100644
--- a/tests/fixtures/default-server-settings.js
+++ b/tests/fixtures/default-server-settings.js
@@ -8,7 +8,7 @@ module.exports = {
   , head: 'ae71dca'
   , settings: {
     units: 'mg/dl'
-    , timeFormat: '12'
+    , timeFormat: 12
     , nightMode: false
     , showRawbg: 'noise'
     , customTitle: 'Test Title'
diff --git a/tests/mmconnect.test.js b/tests/mmconnect.test.js
new file mode 100644
index 00000000000..d92d7f4c425
--- /dev/null
+++ b/tests/mmconnect.test.js
@@ -0,0 +1,121 @@
+/* jshint node: true */
+/* globals describe, it */
+'use strict';
+
+var _ = require('lodash'),
+  should = require('should');
+
+describe('mmconnect', function () {
+  var mmconnect = require('../lib/plugins/mmconnect');
+
+  var env = {
+    extendedSettings: {
+      mmconnect: {
+        // 'userName' for consistency with the bridge plugin
+        userName: 'nightscout'
+        , password: 'wearenotwaiting'
+        , sgvLimit: '99'
+        , interval: '12000'
+        , maxRetryDuration: 1024
+        , verbose: 'true'
+      }
+    }
+  };
+
+  describe('init()', function () {
+    it('should create a runner if env vars are present', function () {
+      var runner = mmconnect.init(env);
+      should.exist(runner);
+      should.exist(runner.run);
+      runner.run.should.be.instanceof(Function);
+    });
+
+    it('should not create a runner if any env vars are absent', function () {
+      [
+        {}
+        , {mmconnect: {}}
+        , {mmconnect: {userName: 'nightscout'}}
+        , {mmconnect: {password: 'wearenotwaiting'}}
+      ].forEach(function (extendedSettings) {
+        should.not.exist(mmconnect.init({extendedSettings: extendedSettings}));
+      });
+    });
+  });
+
+
+  describe('getOptions()', function () {
+    it('should set the carelink client config from env', function () {
+      mmconnect.getOptions(env).should.have.properties({
+        username: 'nightscout'
+        , password: 'wearenotwaiting'
+        , sgvLimit: 99
+        , interval: 12000
+        , maxRetryDuration: 1024
+        , verbose: true
+      });
+    });
+
+  });
+
+  describe('makeRecentSgvFilter()', function () {
+    function sgv(date) {
+      return {type: 'sgv', date: date};
+    }
+    function pumpStatus(date) {
+      return {type: 'pump_status', date: date};
+    }
+
+    it('should return a stateful filter which discards sgvs older than the most recent one seen', function() {
+      var filter = mmconnect.makeRecentSgvFilter();
+
+      filter([2, 3, 4].map(sgv)).length.should.equal(3);
+
+      filter([2, 3, 4].map(sgv)).length.should.equal(0);
+
+      var filtered = filter([1, 2, 3, 4, 5, 6].map(sgv));
+      filtered.length.should.equal(2);
+      _.pluck(filtered, 'date').should.containEql(5);
+      _.pluck(filtered, 'date').should.containEql(6);
+    });
+
+    it('should return a stateful filter which allows non-sgv entries to be old', function() {
+      var filter = mmconnect.makeRecentSgvFilter();
+
+      filter([2, 3, 4].map(sgv)).length.should.equal(3);
+
+      filter([1, 2, 3, 4, 5].map(pumpStatus)).length.should.equal(5);
+
+      var filtered = filter(
+        [1, 2, 3, 4, 5].map(pumpStatus).concat(
+          [3, 4, 5, 6, 7].map(sgv)
+        )
+      );
+      _.filter(filtered, {type: 'pump_status'}).length.should.equal(5);
+      _.filter(filtered, {type: 'sgv'}).length.should.equal(3);
+    });
+  });
+
+  describe('rawDataEntry()', function () {
+    it('should generate a "carelink_raw" entry with sgs truncated and PII redacted', function () {
+      var data = {
+        'lastMedicalDeviceDataUpdateServerTime': 1445471797479
+        , 'sgs': _.range(10)
+        , 'firstName': 'sensitive'
+        , 'lastName': 'sensitive'
+        , 'medicalDeviceSerialNumber': 'sensitive'
+      };
+      var entry = mmconnect.rawDataEntry(data);
+      entry.should.have.properties({
+        'date': 1445471797479
+        , 'type': 'carelink_raw'
+      });
+      entry.data.should.have.properties({
+        'firstName': '<redacted>'
+        , 'lastName': '<redacted>'
+        , 'medicalDeviceSerialNumber': '<redacted>'
+      });
+      entry.data.sgs.length.should.equal(6);
+    });
+  });
+
+});
diff --git a/tests/profileeditor.test.js b/tests/profileeditor.test.js
index ac6e3c95f29..b85b3664007 100644
--- a/tests/profileeditor.test.js
+++ b/tests/profileeditor.test.js
@@ -9,6 +9,7 @@ var nowData = {
   sgvs: [
     { mgdl: 100, mills: Date.now(), direction: 'Flat', type: 'sgv' }
   ]
+  , treatments: []
 };
 
 
diff --git a/tests/reports.test.js b/tests/reports.test.js
index 5c09b130206..97f54550702 100644
--- a/tests/reports.test.js
+++ b/tests/reports.test.js
@@ -10,6 +10,7 @@ var nowData = {
   sgvs: [
     { mgdl: 100, mills: Date.now(), direction: 'Flat', type: 'sgv' }
   ]
+  , treatments: []
 };
 
 var someData = {
@@ -29,7 +30,7 @@ var someData = {
   '/api/v1/treatments.json?find[created_at][$gte]=2015-08-14T00:00:00.000Z&find[created_at][$lt]=2015-08-15T00:00:00.000Z': [{'enteredBy':'Dad','eventType':'Site Change','glucose':268,'glucoseType':'Finger','insulin':1.75,'units':'mg/dl','created_at':'2015-08-14T00:00:00.000Z','_id':'55ce78fe925aa80e7071e5d6'},{'enteredBy':'Mom ','eventType':'Meal Bolus','glucose':89,'glucoseType':'Finger','carbs':54,'insulin':3.15,'units':'mg/dl','created_at':'2015-08-14T21:00:00.000Z','_id':'55ce59bb925aa80e7071e5ba'}],
   '/api/v1/entries.json?find[date][$gte]=1439596800000&find[date][$lt]=1439683200000&count=10000': [{'_id':'55cfd25f38a8d88ad1b49931','unfiltered':283136,'filtered':304768,'direction':'SingleDown','device':'dexcom','rssi':185,'sgv':306,'dateString':'Sat Aug 15 16:58:16 PDT 2015','type':'sgv','date':1439683096000,'noise':1},{'_id':'55cfd13338a8d88ad1b4992e','unfiltered':302528,'filtered':312576,'direction':'FortyFiveDown','device':'dexcom','rssi':179,'sgv':329,'dateString':'Sat Aug 15 16:53:16 PDT 2015','type':'sgv','date':1439682796000,'noise':1}],
   '/api/v1/food/regular.json':  [{'_id':'552ece84a6947ea011db35bb','type':'food','category':'Zakladni','subcategory':'Sladkosti','name':'Bebe male','portion':18,'carbs':12,'gi':1,'unit':'pcs','created_at':'2015-04-15T20:48:04.966Z'}],
-  '/api/v1/treatments.json?find[eventType]=/BG Check/i&find[created_at][$gte]=2015-08-08T00:00:00.000Z&find[created_at][$lt]=2015-09-07T00:00:00.000Z': [
+  '/api/v1/treatments.json?find[eventType]=/BG Check/i&find[created_at][$gte]=2015-08-08T00:00:00.000Z&find[created_at][$lt]=2015-09-07T23:59:59.000Z': [
       {'created_at':'2015-08-08T00:00:00.000Z'},
       {'created_at':'2015-08-09T00:00:00.000Z'},
       {'created_at':'2015-08-10T00:00:00.000Z'},
@@ -62,7 +63,7 @@ var someData = {
       {'created_at':'2015-09-06T00:00:00.000Z'},
       {'created_at':'2015-09-07T00:00:00.000Z'}
     ],
-  '/api/v1/treatments.json?find[notes]=/something/i&find[created_at][$gte]=2015-08-08T00:00:00.000Z&find[created_at][$lt]=2015-09-07T00:00:00.000Z': [
+  '/api/v1/treatments.json?find[notes]=/something/i&find[created_at][$gte]=2015-08-08T00:00:00.000Z&find[created_at][$lt]=2015-09-07T23:59:59.000Z': [
       {'created_at':'2015-08-08T00:00:00.000Z'},
       {'created_at':'2015-08-09T00:00:00.000Z'},
       {'created_at':'2015-08-10T00:00:00.000Z'},
@@ -296,12 +297,12 @@ describe('reports', function ( ) {
 
     result.indexOf('Milk now').should.be.greaterThan(-1); // daytoday
     result.indexOf('50 g (1.67U)').should.be.greaterThan(-1); // daytoday
-    result.indexOf('<td class="tdborder">0%</td><td class="tdborder">100%</td><td class="tdborder">0%</td><td class="tdborder">2</td><td class="tdborder">8.3</td>').should.be.greaterThan(-1); //dailystats
-    result.indexOf('td class="tdborder" style="background-color:#8f8"><strong>Normal: </strong></td><td class="tdborder">38%</td><td class="tdborder">6</td><td class="tdborder">8.7</td><td class="tdborder">8.8</td><td class="tdborder">0.2</td>').should.be.greaterThan(-1); // distribution
-    result.indexOf('<td>16 (100%)</td><td>11</td><td>8.3</td><td>8.9</td><td>10.6</td><td>11.7</td><td>18.3</td><td>2.7</td>').should.be.greaterThan(-1); // hourlystats
+    result.indexOf('<td class="tdborder">0%</td><td class="tdborder">100%</td><td class="tdborder">0%</td><td class="tdborder">2</td>').should.be.greaterThan(-1); //dailystats
+    result.indexOf('td class="tdborder" style="background-color:#8f8"><strong>Normal: </strong></td><td class="tdborder">38%</td><td class="tdborder">6</td>').should.be.greaterThan(-1); // distribution
+    result.indexOf('<td>16 (100%)</td>').should.be.greaterThan(-1); // hourlystats
     result.indexOf('<div id="success-grid">').should.be.greaterThan(-1); //success 
     result.indexOf('<b style="padding-left:4em">CAL</b>:  Scale: 1.10 Intercept: 31102 Slope: 776.91').should.be.greaterThan(-1); //calibrations
-    result.indexOf('<td>Correction Bolus</td><td align="center">250 (Sensor)</td><td align="center">0.75</td><td align="center"></td><td>Mom </td><td></td>').should.be.greaterThan(-1); //treatments
+    result.indexOf('<td>Correction Bolus</td><td align="center">250 (Sensor)</td><td align="center">0.75</td>').should.be.greaterThan(-1); //treatments
     
     done();
   });
diff --git a/tests/settings.test.js b/tests/settings.test.js
index 712928a2a29..531e6944825 100644
--- a/tests/settings.test.js
+++ b/tests/settings.test.js
@@ -8,7 +8,7 @@ describe('settings', function ( ) {
   var settings = require('../lib/settings')();
 
   it('have defaults ready', function () {
-    settings.timeFormat.should.equal('12');
+    settings.timeFormat.should.equal(12);
     settings.nightMode.should.equal(false);
     settings.showRawbg.should.equal('never');
     settings.customTitle.should.equal('Nightscout');
@@ -56,9 +56,10 @@ describe('settings', function ( ) {
       , 'BG_TARGET_TOP'
       , 'BG_TARGET_BOTTOM'
       , 'BG_LOW'
+      , 'SCALE_Y'
     ];
 
-    expected.length.should.equal(23);
+    expected.length.should.equal(24);
 
     var seen = { };
     settings.eachSettingAsEnv(function markSeenNames(name) {
diff --git a/tests/storage.test.js b/tests/storage.test.js
index de9d265325a..6f399746bdc 100644
--- a/tests/storage.test.js
+++ b/tests/storage.test.js
@@ -46,7 +46,7 @@ describe('STORAGE', function () {
 
     (function () {
       return require('../lib/storage')(env, false, true);
-    }).should.throw('URL must be in the format mongodb://user:pass@host:port/dbname');
+    }).should.throw(Error);
 
     done();
   });