clean up the alerts
better error messages