KWIC bugs

Issues grabbing the proper tokens to be highlighted, unnecessary
looping, etc