More fixes to textouput source