some improvements to collisions