Commented Alerts and minor changes