Minor bugfixes
Add support for power to kWh/h conversion