some minor routing tweaks