add download in individual thread + small changes