Updates to Sets

Data was set up terribly, now it can handle it