fixed routing bugs in new routing system