regex imrovements not dealing w/punc yet