event fixes
merge