more class/role tweaks