Changes to run scraper

Pulled out adhoc, adjusted other accordingly