Improve planar collision

1 last intersection test to go, then on to sweeping!