Tweaks and modified (and now optional) emails + additional test