Added functionality to more easily change the engine type.
Also fixed some issues with unused code in the controller.