Reworked the conversions between Joule/KWh/etc. and corrected (dis)charge unit from Watt to WattSecond.