Tidy up a few bits and bobs

Stuff I spotted while writing the first draft of the docs