mostly grc updates, some other tidy ups