engine simulator fixes and developement