Fixed a small issue with simulations which are too fast to run (!!) (#112). Also, some minor cleaning up.