Fixed a bug where the help wasn't displayed correct
Removed useless too many args message
Some formatting changes
Removed useless NoPermissions Message
Merge remote-tracking branch 'origin/master'