Minor tweaks. Going to run the profiler one more time and then I think it's time to get serious about this mess...