fixes, better handling of failed downloads