Some more build script updates/additions
Script in good shape at this point