some different motor setup dis-armed fixes