fixes from class