some more class/role updates