Further cleaned up Build scripts, special thanks to Jared