minor edits, name changes