Cleaned up energy for maintenance; time step is global; all energy functions calculate energy per time step (conversions from daily amounts are internal to the functions).