Major zsh changes