Changed figures - added self-consumption of energy and embodied energy to society and changed labels on total energy diagrams
Changes to materials equations