Enum extension + some other scraping fixes

Ah ok, this was a result of not grasping what was going on with the outer loop