improved word delimiters