cleanups and improvements
make URIs stable