lots of scraper fixes