routing improvements and fixes