various tour fixes