Fixed all the events.  Must make sure all functionality is working correctly.