Add simple energy data heuristic
Fix energy calibration