minor fixes regarding output format