refactors, added handling when trying to download from the same url
fix to retry dao, refactors