adding variables of some classes and correcting some mistakes