More documentation; adding namespaces.