Wander and travel fixes, cleanups