event fixes

to be continued