Fixed up word count comparison and more subtleties