setup.sh improved