BP 2.0 fixes

This is a follow-up to what I mentioned in #6.

And should fix the majority of issues that have arisen in the groups component during the (ongoing) development of BP 2.0.

@dcavins - If you can test these changes and see if it fixes things for you, that'd be great!