FIXED: Apex scraping works now. Plus general tidy