More improvements to the image downloading.