some updates to the builder