Class check added, Fixed typo's.