improvements to scraper