Small updates to set handling and add early support for strings - strings still doesn't really work