Enum extension + some other scraping fixes

because they can be set inside the loop and you don't want those values to leak the next iteration.