More fixes to textoutput source part 2.