minor tweaks to the tokenization regex