Miscellany

Yeah, sorry - I pushed a broken revision of this. I'll push a fixed up one soonish (not tonight).