Enum extension + some other scraping fixes

you dont need these elses. Just put `return 'int'` after `int(stringy_val)`