Finished emailcheck

And some random fix