more updates. finally got routes fixes