more refactoring and addition of custom substitutions (to handle things like USSR), NYT test tweaks
more accurate readme