Tweaks and URL additions