fixes to output format