bug fixes for collisions and round ending