Various small fixes and ability to limit emails by mask.