Minor fixes to Shooter, including pickup sequence