more event bug fixes