uribuilder cleanup
link fixes