improvements to setup.sh