Javadoc update and minor fix;