More energy balancing and other stuff