include base path in generated uris
cleanup