Add the ability to create sets, + a couple fixes