Added some more Factory stuff and small things.