Fixed simulations so that they run

More debugging is needed for a smooth run