More tweaks to the scraper.