More updates to scraper, removing card-matches-p from parent loop, additional clean-ups and performance improvements, per issue #2