Shooter fixes (confirm correctness before accepting)

Shooter fixes (confirm correctness before accepting)