More buildscript changes..... yaaaaaaaay! -___-