Improved help messages on CLI.