fixed intersection definitions for faster tracing. Tracing still buggy.
(incomplete) debugging of the Trace() function