adding way to routing + fixes