some tweaks to builder