merge passes jslint
debugging event.js and cleaning lint errors