new improvemments to setup.sh