Improve tour implementation a bit towards the final goal.