Some touchups to the tour integration