Bug fixes. Scheduler (WIP) & Mailer (WIP)