Some corrections

Fixes #4 and resolves mail-to-event bug.