error fixes
more namespaces