more work on the energy terms
improved export options in the interface