Add energy to the per step calculation.
General tidy up and improvement + diagrams showing the limited set of
energy changes.