a variety of minor edits