change regex for ID and reserved words to be surrounded by spaces or
puncuation