Lots more bug fixes. For some reason the simulation runs for like 5 mintues instead of the requested 30 seconds…but it finishes cleanly.