more modifications to output formatting