event.js fixes