new collisions: various fixes