use PersistentHashSet for ValueSet storage
ValueSet updates
extra types
extra type symbols
misc edits