Added color alerts
Minor fixes