cleanup + edited build script