Zsh completion

Several small updates for zsh completion