Finished updating with last night's scraping round
A few test reports, there still are issues