improvements to builder