more beefing up of setup.sh