Correct mail receiving and add some comments

Last commit i guess