Lots of minor edits

Now it's Steve's turn!