Filled in some javadoc