changed: new data scraper handling, code cleanup