Cleaned up output files. Added energy output.