Reworked manual override flag, reworked arming slightly. Pending testing
Merged