setup.sh tweaks