Slight correction to NPCR dictionary.
Improvements and cleanups with search and testing.