Fix command line help.
Improve user output.