#221 improvements to scraping