adds alerts
more alterting
more alert bugfixes
Merge branch 'alert'