Update forge and javadoc cleanup