FIXED: Various fixes to scraping.