Now respecting max feed errors and improved handling of pending tasks