moved energy calc to mission, small clean-up throughout