committing zsh changes and script cleanup