Switched parallel composition operator from '|' to '+'
Switched multisets to sets
Minor documentation update