Re-applying some other spelling/punctuation fixes that were recently overwritten by a merge