Load of Heathcliff edits from Erik

Basically the last week of their edits but it's too late to add them to the appropriate post so I'm just loading them all here in the comments.