Wild Gun: Optimizations and minor updates

Optimizations and minor updates.