Edits to remove electron eta problem, synch with Anna