Fixed and Tweaked TPAIntersect