partial fix of event updates... realize the events model needs more thought