Improve accuracy reporting
adjust indentation
Support odd line output