bugfixes and cleanup in vv_collisions