update organization, url
cleanup