Small fixes and modifications to download tool