Improvements & bugfixes on Content Downloader