Enum extension + some other scraping fixes

Hmm... This feels like it has the potential to lead to rather significant confusion but I dont know of any functions that actually use this sort of docstring. Do you know of any?