pull in help fixes from latest master

Signed-off-by: nuss <st9fan@gmail.com>