added warning for retry downloads

+ various minor changes

I have not tested this much, not sure if I broke anything.

Plan to work more on it in the next few days. You can wait until then to decide to merge if you wish.