Made setup.sh better