assorted minor edits