Energy chapter figure update to Energy instead of power and general improvements.