Bug fixes

Fixed a bug where the user could break set addition/removal