minor event fixes and tweaks