changed some output formatting