namespaces and bug fixes