Added unitName and improved Unit class. Improved Main class.