More URLs, revamped scraper