Some factories complete and misc fixes.