EngineState is scoped to the Engine, demo fixes, etc