merged original zsh changes before submodule issues