Minor fixes and mailgun educaiton