URL tweaks and miscellaneous improvements