more changes to setup.sh