Run.sh improvements