Better event display, fixed event update bug