Add EventEmitter + fix for r.args + feeds