Improvements to scraper scripts