Bug fixes

Fixed the class and inheritance section