simplify event classes
minor fixes