Fixes and qb examples
Update to es6 generators