Fixed guardian spec, added some command switches to scraper