Added/updated javadoc comments...