More javadoc added.