fix dump output for off-mode; some formatting fixups