role and multi modality fixes
fixes