update routes and related bugs