tweaks to match docs at http://redmine.jeelabs.org/projects/jeebus/wiki