Bug with Engine fixed

Engine.stop stops all timeouts.
Other minor fixes.