Fixed some things in Simulation for the demo. Some results carried over to other files.
Cleaned up a few things in comments.
Cleaned up a few things. Mostly comments.