Continuing to work on rewriting and recommenting all scraper code to work better with the new program flow model