Fixed downloader; needs testing