fixed scraping, added more sources