#758: #721: misc edits

opened by thuchacz