Updates to scraper etc

Updates to scraper etc