tweaks and fixes to match scraper