Text improvements; pending test