output formatting fixes