Added stuff missing from last commit.  Added searching for singular forms or apparently plural words