rebase;fix some uris