Hmm yes (at least I like to believe it does). Oh I recall now where the actual problem I mentioned was: it was in the block below that handles the flag-extraction. If you want this back to the way it was, I'll change it back, I'm fine with it either way.