Very find algorithm (which seems to work fast enough), small changes to scraper