Fix up more uris, add enumerators / measures