ZSH improvements