Minor changes to download.py and added a wealth of advanced search options