fix merge errors
better loggin of downloads