fixed race condition for engine start/stop event

[Dav-Renz]

please ignore the other 4 commits, I don't understand git enough to understand why they need to exist.