Adding guest support and cleaning some routes