bug fixes, beginning done route