minor tweaks to builder algorithmics