some tweaks to output formatting for diagnostic command.