Cleanup, and added a new domain to emails as well as a new random type Boolean