Enum extension + some other scraping fixes

clever!  I think a list of tuples makes more sense here (as we are only iterating, not slicing into the data structure.