added CountNormalizer, minor changes