Javadoc ; Almost final commit