Fixes scraper. It now acrtually does what it says on the tin...