Email Changes

changes to the email system, most likely bug fixes, dunno