Simulation cleanup

Tweaked some of the numbers. 
Produces a lot of junk, but some good results.