some event tweaks