final updates and javadocs generated