Minor factory changes. Lots of tasks to deal with

!!