changing the driver to use the new EngineDescription classes, and other minor changes