scraper improvements