Javadoc and other comments addressed