cleaned up some of the alert data names, also fixed a bug or two