Add download and fix error