Fixed some more things in the scraping algorithm