E-Mail notifications framework, discovery fixes, logging tweaks.