Changes and formatting from Greg after face-to-face chat (thanks!)