got irregular nouns working, added security measures