Finished!

Bug fix in Energy Conservation, more graphical output.