Minor updates on group support.
Also getting to the point where this needs some cleanup instead of just piling on stuff that I think of.
