More small improvements on nouns