improvements to command-line Demo