fixed some routings