Cleanup and misc fixing; Don't allow engine operations when idling