Build script fixing work.
The build script somehow seems less neccessary now. oh well.