scraper and data import updates and refactoring