bug fixes on collision + Shot class created