*Some javadocs fixes