Some clean up and hopefully fixed the download