More minor additions to modeling text