small changes for output and format