#637: More edits