fix instance of not arming/disarming; clean up