did clean and build
changed most email fields to first and last name