added scrape data and other changes