some fix and add step for tour