Updated comments/javadoc