Adding Mail validation + many bugfixes.