added a few 'f', corrected javadoc