a few more routing improvements