Added/fixed some javadocs