email fix, changes