Improved border consistency, improved collision detection