Various modifications to setup.sh