a bunch of minor edits