minor types fixes

haven't checked complicated things like <= and union yet
rearranged sets a bit

to no real outward-facing purpose