added/updated javadocs