some minor edits