several minor edits