edits, fix names