Added hooks for energy measurement device
Fixes for timing, plus UI tweaks