Updated Alerts; misc fixes
Merge branch 'staging'