new_collisions: various fixes/tweaks