clean up some error checking logic
Merge remote-tracking branch 'origin/master'
fix the build script. set the build properly