more output fixes
Merge branch 'testing'