beefing up setup.sh