Updates to misc items in download process, database class and basicmerge.py