some cleanups on the tour