minor fixes to events. stable version before making other changes