a bunch of builder tweaks