Small fixes, tweaks and comments on Builder implementation.