small fixes for output formatting