Further improved setup.sh