fixing routing
fixing up some errors
fixing up some errors