Renewed Javadoc, corrected forward