Some changes to setup.sh