#478: More edits