Updated Tolstyak failed download handling branch
Some fixes for latets commit