Tuning parameters, fixing bugs
Test changes
Updated Simulation Profile
Merge pull request #3 from DMcNamara/SimulationCleanup

Simulation cleanup