Fix a typo, and correct the javadoc in a few spots.