Finish work on Alternate Urls
Misc updates