Improve output juggling; fix