added get_energy_components from Jason Marshall
added new functions from Jason Marshall