Added download links and better error handling