a few changes to scraping structure