Final cleanup and download-imgs fix

There are no more delays in the code
Download-imgs now downloads the imgs from the web, the zip file couldn't
be used because ant incorrectly parses the url