fix issues reported
download per requirement
fix issues