Added special cases to type-scoring