Tweaks to URLs

Just the usual URL tweaks so it all makes sense on my server.