Updates and framework adjustments

* new build.sh