Fix API
kWh
HP/HC
Fix bugs