more minor routing improvements