Added some javadoc comments...