final fixes + javadocs.