Make x bigger, updated tour, more caching