Fav Stop now checks for Fav Route, Cleaned up code