small fixes from class