Master with fetch feeds

Corrections to broken code.