more event.js fixes