re-doing collisions; fixed shooting