Enum extension + some other scraping fixes

good point