fixed some errors with namespaces