more code fixes around groups...