routing, various fixes