Fixing up the events list!