Changed energy usage calculation, and other stuff