fix some help texts
Merge remote-tracking branch 'origin/master'