URL update and more cleanup