Updating downloader to be more general
small changes