various minor edits