I changed the order that stuff is resolved in. This moved a lot of code. Please update your cvs trees or massive conflicts will ensue. if anyone totally doesn't understand what I did to TR, that's fine. It works better like this, trust me :-) (I made the 'returning false' thing a little less important)