more roles and caps fixes