Fixed some additional things.

Eric Dignumrequested to merge
simulations into master

Accidentally removed the previous simulations branch.

Merge request reports