Adding send email support
Fixing some staff