A few improvements to scraper