Buildscript update + Tweaks