Improve intersection detection -- faster, less memory
Tweak intersection detection, etc