Add mails
General fixes