a bit more tweaking of event updates and such