fixed shotgun bugs