more routing tweaks