small fixes, was sending empty mails