Fix for pig count correction and bug related to tokenization of surface forms ("East Germany" vs. "East  Germany").