Fixed bug with downloader
updated more stuff for unified