More work on build.sh