CONN-473: Updates to javadoc and comments.