user route and minor changes