more setup.sh updates