Added download path to the config and some cleaning up