fixes and improvements in engine simulator