Major bugfixes for scraper