numerous output fixes
output fixes