better namespaces, some comments