zshell and vim fixes