clean up collisions a little