Added icon, fixed error messages