event improvements