Javadoc and comments updated