output format improvements