updates
more edits for names
final edits