[#239] more event stuff