Enum extension + some other scraping fixes

PEP8 requires a space between hash and word