many scraping improvements