More minor tweaks to scraper