Various changes (not all of which I can remember), as well as a lot of changes to the factory manager to split it up a bit.