Switched to using EIA instead of IEA.
Detailed edits on the energy sections with Caleb.