replaced emails w names & bug fixes