Email fix, and other changes
resolving conflicts