fixes, output reorg
fixes, output reorg