more improvements to the scraper