some improvements to scrapers