output fixes
Merge remote branch 'origin/threaded' into threaded