updated namespaces, comments