small enhancements in outpu