Improved collision detection with arrows and narrow edges