Cosmetic changes

And functions for adding/removing groups of cells