Fixed duplicate downloads and storage.