Updated with zsh bits and pieces