Javadoc added/fixed