don't update the feed while still downloading + some refactoring