Cleaned up the e-mail formats
Update comments/work-in-progress/new features