addend comments + worked on sending mail