merge fixes from class