Further fiddles

Nothing exceptional, just clean up and small changes. Still got same
recording issues.

Committing changes before moving onto map stuff