added comments, mail etc