couple of events.js changes