Cleaned up changes and prelim for nouns and verbs