fixing up all routes