Nouns added, some problem fixed.