Completed javadoc (again)