Comment/Javadoc updates