Javadoc and final fixes