Updated Comments/Javadoc