fixed collisions a bit