Javadoc pretty much finished