improved word delimiters, reverted to old trigger system