housecleaning and added collisions