Rewriting alerts
Merge pull request #48 from shayhowe/misc_updates

Rewriting alerts