Bugfix to make punctuation normalizer work again

Punctuation normalizer wouldn't match any of its regex.

Also contains my lost commits for terminal/NT iteration again.