Tidied up role records and tooltips