Out and about part 2

Fixing a few things