Modified setup.sh and zshrc