Updated Alerts; misc fixes