more work to manage feeds, fixes #3