improved full scrape script