Integrate Jonny's Hoover scraper, major bug fixes