Javadocing weee
Merging in javadoc discrepancy