Improved setup.sh