Fix watt_hour definition. closes #4