Improve energy

This creates a much nicer chart, I think.