tighter entries
todo note about cleaning namespaces