4 new scrapers, some code cleanup, new fixes