Bit of cleanup, added intersection & reunion, removed color logic etc.