merge rework of the zsh completion script to make it actually work