tweaked setup.sh