tsv output, more CLI cleaning