Change Javadoc to follow convention. Fix some typos.