fixed some brokenness
finally finished set conversion