setup.sh improvements