Styling tweaks and changes to build scripts.