Fixed up route bugs