Cleaned the simulation package, allowing easier usage/modification