Fixed term counts, spelling.  #2460

Terms were being counted.  Then that number was set to null and not counted again.  Looks like copy paste gone awry.

#2460