added more features and option to simulate
added link to rerun without simulation