Changes URIs to Addressable
Changes minor things