updated Event.h/C