email fix, comments