More setup.sh changes
More setup.sh changes