Enum extension + some other scraping fixes

Finally got the whole thing working. I put in a pull request against Caswell's branch. I'm assuming that once it merges into Caswell's branch the updates will show up here?