Added remaining javadoc