Some edits in response to commentary by @cheddar