More fixes to textoutput source