more fixes to use groups instead of scribe/lead/safety