Some fixes to comments and factory namespaces