more events fixes and the like