Commandline improvements to match documentation.