Added new classes & words, minor fixes

Better practice using constructors.
Added new classes, added new words.