final tweaks to build scripts and options