collisions improvements and fix in progress