Values show in Wh instead of mWh, minor fixes