Improvments to tour plugin