Enum extension + some other scraping fixes

@giltis You are currently working an this code, can you take care of this?