event bug fixes, some more performance