Shooting improvements
Shooting fix