event fixes, some more performance