Update to the scraper and several components around it