fixed most scraper issues