Added ghost scrapper, minor things to fix