Added some javadoc again, don't know why it disappeared