Merge pull request #17 from tsandall/set-clarity

Refined set syntax and more