Major updates to scrape.py