Minor changes in EngineSimulator (improvements and fixes)