Fixed bug in downloader and clean up spec