Matt, I've integrated the stuff you sent me and successfully passed all the regression tests and a self-compile. Good job! The performance problems are still there (not due to your changes) and I'm looking into them. Let me know when you want it, and I will make a snapshot available which should be sufficiently stable for the rest of your summer work.