hopefully improved some structuremap scoping. Still have big dispose leaks.