BASIC changes to the Email Notifier AND no empty fields!