Split run.sh off from make.sh and improve make.sh a bit.