stream javadoc + minor changes to conform to the doc