improve implementation of text syntax (continued)