More comments/javadoc