minor mods to setup.sh