Did some more work on the StandardEngine.