minor improvements to collisions