Making sure all the Url's point right, and some more changes