Fixed some output formatting issues