Add EventEmitter; fix dataset screwup