Updates to zsh, separate scripts