More checks added
Final version of HW2 with file download