Some fixes but still not motoring