email fix among other things