did some cleaning in with collisions