Fixed and added some alert features