Minor changes for new namespaces, and more documentation