updates to infastructure.  Scraper also now supports shutdown correctly