minor updates
Merge branch 'gr' into mi