Shooting and slight fixes