add additional attributes and clean up scraper)