bugfixes + updated energy usage numbers