More reconciliation with reality
Text output now does transposing and handles repeats