added nouns and some fixes