clean route and bug fixes