Fixed Alert message and assorted changes