fixed collisions everything else