Updates after a bit more work on the engine