minor changes + some documentation to the builder