Tried to repair / debug the collision detection system but ran into more unexpected problems