Improved simulator, added gantt data collection