Checkpoint, arming/disarming still has a bug