Tidied up the main run file, switching to windows due to simulations issues in os x