.on() no longer returns array w/ event name and handler, .off() no longer accepts an array, clean up var names a bit