more role tweaks