Added Cp*T as another energetics paramter to track. Fixed units on some other parameters