Fix some of the help output and zsh completion