Enum extension + some other scraping fixes

PEP8 requires white space between hash and words