changes to build script, cleaned other stuff up