various improvements to the cli output