Minor improvements & fixes & initial download strategy