fixes to routing