Tour & Spread - Minor Updates

Requires a related internal PR.

to @bsstoner