Javadoc
toString override and builder correction