More javadoc and improvements to existing javadoc